wangzhe 2 роки тому
батько
коміт
1d1e371e22

+ 36 - 2
test-api/src/main/java/com/sooka/api/Guiji_Gas.java

@@ -95,7 +95,7 @@ public class Guiji_Gas extends BaseApi {
     }
 
     /**
-     * 真兰收费系统 - 购气信息 (互联网)
+     * 真兰收费系统 - 预付费购气信息 (互联网)
      */
     @POST
     @Path("/guiji_gas_Zenner_gas_purchase_infor")
@@ -116,7 +116,7 @@ public class Guiji_Gas extends BaseApi {
     }
 
     /**
-     * 真兰收费系统 - 购气信息 (内网)
+     * 真兰收费系统 - 预付费购气信息 (内网)
      */
     @POST
     @Path("/guiji_gas_Zenner_gas_purchase_infor_forward")
@@ -129,6 +129,40 @@ public class Guiji_Gas extends BaseApi {
     }
 
     /**
+     * 真兰收费系统 - 中心计费购气信息 (互联网)
+     */
+    @POST
+    @Path("/guiji_gas_Zenner_gas_purchase_center_infor")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_gas_Zenner_gas_purchase_center_infor(String str) {
+        ResultModel r = new ResultModel();
+        try {
+            HttpUtil.doPost(forward_url + "/api/guiji_gas_Zenner_gas_purchase_center_infor_forward", str, null);
+            r.setCode(0);
+            r.setMessage("成功");
+        } catch (Exception e) {
+            r.setCode(99999);
+            r.setMessage("失败" + e.getMessage());
+        }
+        return r;
+    }
+
+    /**
+     * 真兰收费系统 - 中心计费购气信息 (内网)
+     */
+    @POST
+    @Path("/guiji_gas_Zenner_gas_purchase_infor_center_forward")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_gas_Zenner_gas_purchase_infor_center_forward(String str) {
+        ResultModel r = guiji_gas_service.guiji_gas_Zenner_gas_purchase_center_infor(str);
+        return r;
+    }
+
+    /**
      * 真兰收费系统 - 抄表信息 (互联网)
      */
     @POST

+ 2 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_Gas_Mapper.java

@@ -15,6 +15,8 @@ public interface Guiji_Gas_Mapper {
     public void update_guiji_gas_Zenner_gas_meter_infor(Guiji_gas2_Zenner_gas_meter_infor_Bean bean);
     public void add_guiji_gas_Zenner_gas_purchase_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
     public void update_guiji_gas_Zenner_gas_purchase_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
+    public void add_guiji_gas_Zenner_gas_purchase_center_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
+    public void update_guiji_gas_Zenner_gas_purchase_center_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
     public void add_guiji_gas_Zenner_meter_reading_infor(Guiji_gas4_Zenner_meter_reading_infor_Bean bean);
     public void update_guiji_gas_Zenner_meter_reading_infor(Guiji_gas4_Zenner_meter_reading_infor_Bean bean);
 

+ 2 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_Gas_Mapper2.java

@@ -14,6 +14,8 @@ public interface Guiji_Gas_Mapper2 {
     public void update_guiji_gas_Zenner_gas_meter_infor(Guiji_gas2_Zenner_gas_meter_infor_Bean bean);
     public void add_guiji_gas_Zenner_gas_purchase_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
     public void update_guiji_gas_Zenner_gas_purchase_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
+    public void add_guiji_gas_Zenner_gas_purchase_center_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
+    public void update_guiji_gas_Zenner_gas_purchase_center_infor(Guiji_gas3_Zenner_gas_purchase_infor_Bean bean);
     public void add_guiji_gas_Zenner_meter_reading_infor(Guiji_gas4_Zenner_meter_reading_infor_Bean bean);
     public void update_guiji_gas_Zenner_meter_reading_infor(Guiji_gas4_Zenner_meter_reading_infor_Bean bean);
 

+ 18 - 2
test-api/src/main/java/com/sooka/model/bo/Guiji_gas3_Zenner_gas_purchase_infor_Bean.java

@@ -9,8 +9,10 @@ import lombok.Setter;
 public class Guiji_gas3_Zenner_gas_purchase_infor_Bean extends BaseBean_Guiji {
 
     String str;
-
     String GUID;//GUID
+    /**
+     * 预付费
+     */
     String VC_SG_USERGUID;//用户GUID
     String N_SG_BEFOREAMOUNT;//上次结余
     String N_SG_SHOULDAMOUNT;//应收金额
@@ -20,6 +22,20 @@ public class Guiji_gas3_Zenner_gas_purchase_infor_Bean extends BaseBean_Guiji {
     String VC_SG_OPCODE;//收款人
     String D_SG_SALEDATE;//收款日期
     String VC_SG_SALEORBACK;//缴费类型:售|退气
-
 //    GUID, VC_SG_USERGUID, N_SG_BEFOREAMOUNT, N_SG_SHOULDAMOUNT, N_SG_FACTAMOUNT, N_SG_LASTAMOUNT, VC_SG_IVNO, VC_SG_OPCODE, D_SG_SALEDATE, VC_SG_SALEORBACK
+
+    /**
+     * 中心计费
+     */
+    String VC_JFD_USERGUID;//用户GUID
+    String N_JFD_BEFORENUM;//上次读数
+    String N_JFD_LASTNUM;//本次读数
+    String N_JFD_BEFOREAMOUNT;//上次结余
+    String N_JFD_AMOUNT;//实收金额
+    String N_JFD_LASTAMOUNT;//本次结余
+    String VC_JFD_INVOICE;//发票号码
+    String VC_JFH_SKPERSON;//收款人
+    String D_JFH_SKDATE;//收款日期
+    String VC_JFD_SKTYPE;//缴费类型(1-冲预付 2-预存调整 3-收本期气费 4-退款 5-后付费充值)
+    //    GUID, VC_JFD_USERGUID, N_JFD_BEFORENUM, N_JFD_LASTNUM, N_JFD_BEFOREAMOUNT, N_JFD_AMOUNT, N_JFD_LASTAMOUNT, VC_JFD_INVOICE, VC_JFH_SKPERSON, D_JFH_SKDATE, VC_JFD_SKTYPE
 }

+ 11 - 11
test-api/src/main/java/com/sooka/model/bo/Guiji_gas4_Zenner_meter_reading_infor_Bean.java

@@ -11,16 +11,16 @@ public class Guiji_gas4_Zenner_meter_reading_infor_Bean extends BaseBean_Guiji {
     String str;
 
     String GUID;//GUID
-    String VC_JFD_USERGUID;//用户GUID
-    String N_JFD_BEFORENUM;//上次读数
-    String N_JFD_LASTNUM;//本次读数
-    String N_JFD_BEFOREAMOUNT;//上次结余
-    String N_JFD_AMOUNT;//实收金额
-    String N_JFD_LASTAMOUNT;//本次结余
-    String VC_JFD_INVOICE;//发票号码
-    String VC_JFH_SKPERSON;//收款人
-    String D_JFH_SKDATE;//收款日期
-    String VC_JFD_SKTYPE;//缴费类型(1-冲预付 2-预存调整 3-收本期气费 4-退款 5-后付费充值)
+//    String VC_JFD_USERGUID;//用户GUID
+//    String N_JFD_BEFORENUM;//上次读数
+//    String N_JFD_LASTNUM;//本次读数
+//    String N_JFD_BEFOREAMOUNT;//上次结余
+//    String N_JFD_AMOUNT;//实收金额
+//    String N_JFD_LASTAMOUNT;//本次结余
+//    String VC_JFD_INVOICE;//发票号码
+//    String VC_JFH_SKPERSON;//收款人
+//    String D_JFH_SKDATE;//收款日期
+//    String VC_JFD_SKTYPE;//缴费类型(1-冲预付 2-预存调整 3-收本期气费 4-退款 5-后付费充值)
+
 
-//    GUID, VC_JFD_USERGUID, N_JFD_BEFORENUM, N_JFD_LASTNUM, N_JFD_BEFOREAMOUNT, N_JFD_AMOUNT, N_JFD_LASTAMOUNT, VC_JFD_INVOICE, VC_JFH_SKPERSON, D_JFH_SKDATE, VC_JFD_SKTYPE
 }

+ 1 - 0
test-api/src/main/java/com/sooka/service/Guiji_Gas_Service.java

@@ -7,6 +7,7 @@ public interface Guiji_Gas_Service {
     public ResultModel guiji_gas_Zenner_user_infor(String str);
     public ResultModel guiji_gas_Zenner_gas_meter_infor(String str);
     public ResultModel guiji_gas_Zenner_gas_purchase_infor(String str);
+    public ResultModel guiji_gas_Zenner_gas_purchase_center_infor(String str);
     public ResultModel guiji_gas_Zenner_meter_reading_infor(String str);
 
     public ResultModel guiji_gas_Aofe_user_infor(String str);

+ 55 - 5
test-api/src/main/java/com/sooka/service/impl/Guiji_Gas_ServiceImpl.java

@@ -136,7 +136,7 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
             log.put("interfaceinfoId", "922941df-096f-4b63-80c8-3c822db6cfc1");
-            log.put("interfaceinfoName", "归集-真兰收费系统-购气信息");
+            log.put("interfaceinfoName", "归集-真兰收费系统-预付费购气信息");
 
             Guiji_gas3_Zenner_gas_purchase_infor_Bean bean = new Guiji_gas3_Zenner_gas_purchase_infor_Bean();
             initBaseGuijiBean(str, bean);
@@ -178,16 +178,16 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
     }
 
     @Override
-    public ResultModel guiji_gas_Zenner_meter_reading_infor(String str) {
+    public ResultModel guiji_gas_Zenner_gas_purchase_center_infor(String str) {
         ResultModel r = new ResultModel();
         Map log = new HashMap();
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "4a7859be-daac-4ee0-b961-5a5c12aaba3f");
-            log.put("interfaceinfoName", "归集-真兰收费系统-抄表信息");
+            log.put("interfaceinfoId", "397882f8-e83e-412f-bffd-387b94ba32a8");
+            log.put("interfaceinfoName", "归集-真兰收费系统-中心计费购气信息");
 
-            Guiji_gas4_Zenner_meter_reading_infor_Bean bean = new Guiji_gas4_Zenner_meter_reading_infor_Bean();
+            Guiji_gas3_Zenner_gas_purchase_infor_Bean bean = new Guiji_gas3_Zenner_gas_purchase_infor_Bean();
             initBaseGuijiBean(str, bean);
             JSONObject jsonObject = JSON.parseObject(str);
             bean.setId(jsonObject.getString("id"));
@@ -205,6 +205,56 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
             bean.setD_JFH_SKDATE(Data.getString("D_JFH_SKDATE"));
             bean.setVC_JFD_SKTYPE(Data.getString("VC_JFD_SKTYPE"));
             if (bean.getCd_operation().equals("I")) {
+                guiji_gas_mapper.add_guiji_gas_Zenner_gas_purchase_center_infor(bean);
+                guiji_gas_mapper2.add_guiji_gas_Zenner_gas_purchase_center_infor(bean);
+            } else {
+                guiji_gas_mapper.update_guiji_gas_Zenner_gas_purchase_center_infor(bean);
+                guiji_gas_mapper2.update_guiji_gas_Zenner_gas_purchase_center_infor(bean);
+            }
+            r.setCode(0);
+            r.setMessage("成功");
+        } catch (Exception e) {
+            log.put("operationStatus", "0");
+            log.put("exceptionLog", e);
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        } finally {
+            log.put("param", str);
+            log.put("results", r);
+            HttpUtil.doPost(BaseApi.manager_url + "/system/interfaceLog/addLog", JSONObject.toJSONString(log), null);
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel guiji_gas_Zenner_meter_reading_infor(String str) {
+        ResultModel r = new ResultModel();
+        Map log = new HashMap();
+        try {
+            log.put("operationStatus", "1");
+            log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
+            log.put("interfaceinfoId", "4a7859be-daac-4ee0-b961-5a5c12aaba3f");
+            log.put("interfaceinfoName", "归集-真兰收费系统-抄表信息");
+
+            Guiji_gas4_Zenner_meter_reading_infor_Bean bean = new Guiji_gas4_Zenner_meter_reading_infor_Bean();
+            initBaseGuijiBean(str, bean);
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
+            JSONObject Data = bean.getData();
+            bean.setStr(str);
+            bean.setGUID(Data.getString("GUID"));
+//            bean.setVC_JFD_USERGUID(Data.getString("VC_JFD_USERGUID"));
+//            bean.setN_JFD_BEFORENUM(Data.getString("N_JFD_BEFORENUM"));
+//            bean.setN_JFD_LASTNUM(Data.getString("N_JFD_LASTNUM"));
+//            bean.setN_JFD_BEFOREAMOUNT(Data.getString("N_JFD_BEFOREAMOUNT"));
+//            bean.setN_JFD_AMOUNT(Data.getString("N_JFD_AMOUNT"));
+//            bean.setN_JFD_LASTAMOUNT(Data.getString("N_JFD_LASTAMOUNT"));
+//            bean.setVC_JFD_INVOICE(Data.getString("VC_JFD_INVOICE"));
+//            bean.setVC_JFH_SKPERSON(Data.getString("VC_JFH_SKPERSON"));
+//            bean.setD_JFH_SKDATE(Data.getString("D_JFH_SKDATE"));
+//            bean.setVC_JFD_SKTYPE(Data.getString("VC_JFD_SKTYPE"));
+            if (bean.getCd_operation().equals("I")) {
                 guiji_gas_mapper.add_guiji_gas_Zenner_meter_reading_infor(bean);
                 guiji_gas_mapper2.add_guiji_gas_Zenner_meter_reading_infor(bean);
             } else {

+ 51 - 0
test-api/src/main/resources/mapper/Guiji_Gas_Mapper.xml

@@ -176,6 +176,57 @@
     </update>
 
 
+    <insert id="add_guiji_gas_Zenner_gas_purchase_center_infor" parameterType="com.sooka.model.bo.Guiji_gas3_Zenner_gas_purchase_infor_Bean">
+        insert into t_guiji_gas_zenner_gas_purchase_center_infor (
+        <include refid="global_name"></include>
+        GUID, VC_JFD_USERGUID, N_JFD_BEFORENUM, N_JFD_LASTNUM, N_JFD_BEFOREAMOUNT, N_JFD_AMOUNT, N_JFD_LASTAMOUNT, VC_JFD_INVOICE, VC_JFH_SKPERSON, D_JFH_SKDATE, VC_JFD_SKTYPE)
+        values (
+        <include refid="global_value"></include>
+        #{GUID}, #{VC_JFD_USERGUID}, #{N_JFD_BEFORENUM}, #{N_JFD_LASTNUM}, #{N_JFD_BEFOREAMOUNT}, #{N_JFD_AMOUNT}, #{N_JFD_LASTAMOUNT}, #{VC_JFD_INVOICE}, #{VC_JFH_SKPERSON}, #{D_JFH_SKDATE}, #{VC_JFD_SKTYPE})
+    </insert>
+
+    <update id="update_guiji_gas_Zenner_gas_purchase_center_infor" parameterType="com.sooka.model.bo.Guiji_gas3_Zenner_gas_purchase_infor_Bean">
+        update t_guiji_gas_zenner_gas_purchase_center_infor
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
+            </if>
+            <if test="VC_JFD_USERGUID != null and VC_JFD_USERGUID != ''">
+                VC_JFD_USERGUID = #{VC_JFD_USERGUID},
+            </if>
+            <if test="N_JFD_BEFORENUM != null and N_JFD_BEFORENUM != ''">
+                N_JFD_BEFORENUM = #{N_JFD_BEFORENUM},
+            </if>
+            <if test="N_JFD_LASTNUM != null and N_JFD_LASTNUM != ''">
+                N_JFD_LASTNUM = #{N_JFD_LASTNUM},
+            </if>
+            <if test="N_JFD_BEFOREAMOUNT != null and N_JFD_BEFOREAMOUNT != ''">
+                N_JFD_BEFOREAMOUNT = #{N_JFD_BEFOREAMOUNT},
+            </if>
+            <if test="N_JFD_AMOUNT != null and N_JFD_AMOUNT != ''">
+                N_JFD_AMOUNT = #{N_JFD_AMOUNT},
+            </if>
+            <if test="N_JFD_LASTAMOUNT != null and N_JFD_LASTAMOUNT != ''">
+                N_JFD_LASTAMOUNT = #{N_JFD_LASTAMOUNT},
+            </if>
+            <if test="VC_JFD_INVOICE != null and VC_JFD_INVOICE != ''">
+                VC_JFD_INVOICE = #{VC_JFD_INVOICE},
+            </if>
+            <if test="VC_JFH_SKPERSON != null and VC_JFH_SKPERSON != ''">
+                VC_JFH_SKPERSON = #{VC_JFH_SKPERSON},
+            </if>
+            <if test="D_JFH_SKDATE != null and D_JFH_SKDATE != ''">
+                D_JFH_SKDATE = #{D_JFH_SKDATE},
+            </if>
+            <if test="VC_JFD_SKTYPE != null and VC_JFD_SKTYPE != ''">
+                VC_JFD_SKTYPE = #{VC_JFD_SKTYPE},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+
     <insert id="add_guiji_gas_Zenner_meter_reading_infor" parameterType="com.sooka.model.bo.Guiji_gas4_Zenner_meter_reading_infor_Bean">
         insert into t_guiji_gas_zenner_meter_reading_infor (
         <include refid="global_name"></include>

+ 51 - 0
test-api/src/main/resources/mapper/Guiji_Gas_Mapper2.xml

@@ -176,6 +176,57 @@
     </update>
 
 
+    <insert id="add_guiji_gas_Zenner_gas_purchase_center_infor" parameterType="com.sooka.model.bo.Guiji_gas3_Zenner_gas_purchase_infor_Bean">
+        insert into t_guiji_gas_zenner_gas_purchase_center_infor (
+        <include refid="global_name"></include>
+        GUID, VC_JFD_USERGUID, N_JFD_BEFORENUM, N_JFD_LASTNUM, N_JFD_BEFOREAMOUNT, N_JFD_AMOUNT, N_JFD_LASTAMOUNT, VC_JFD_INVOICE, VC_JFH_SKPERSON, D_JFH_SKDATE, VC_JFD_SKTYPE)
+        values (
+        <include refid="global_value"></include>
+        #{GUID}, #{VC_JFD_USERGUID}, #{N_JFD_BEFORENUM}, #{N_JFD_LASTNUM}, #{N_JFD_BEFOREAMOUNT}, #{N_JFD_AMOUNT}, #{N_JFD_LASTAMOUNT}, #{VC_JFD_INVOICE}, #{VC_JFH_SKPERSON}, #{D_JFH_SKDATE}, #{VC_JFD_SKTYPE})
+    </insert>
+
+    <update id="update_guiji_gas_Zenner_gas_purchase_center_infor" parameterType="com.sooka.model.bo.Guiji_gas3_Zenner_gas_purchase_infor_Bean">
+        update t_guiji_gas_zenner_gas_purchase_center_infor
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
+            </if>
+            <if test="VC_JFD_USERGUID != null and VC_JFD_USERGUID != ''">
+                VC_JFD_USERGUID = #{VC_JFD_USERGUID},
+            </if>
+            <if test="N_JFD_BEFORENUM != null and N_JFD_BEFORENUM != ''">
+                N_JFD_BEFORENUM = #{N_JFD_BEFORENUM},
+            </if>
+            <if test="N_JFD_LASTNUM != null and N_JFD_LASTNUM != ''">
+                N_JFD_LASTNUM = #{N_JFD_LASTNUM},
+            </if>
+            <if test="N_JFD_BEFOREAMOUNT != null and N_JFD_BEFOREAMOUNT != ''">
+                N_JFD_BEFOREAMOUNT = #{N_JFD_BEFOREAMOUNT},
+            </if>
+            <if test="N_JFD_AMOUNT != null and N_JFD_AMOUNT != ''">
+                N_JFD_AMOUNT = #{N_JFD_AMOUNT},
+            </if>
+            <if test="N_JFD_LASTAMOUNT != null and N_JFD_LASTAMOUNT != ''">
+                N_JFD_LASTAMOUNT = #{N_JFD_LASTAMOUNT},
+            </if>
+            <if test="VC_JFD_INVOICE != null and VC_JFD_INVOICE != ''">
+                VC_JFD_INVOICE = #{VC_JFD_INVOICE},
+            </if>
+            <if test="VC_JFH_SKPERSON != null and VC_JFH_SKPERSON != ''">
+                VC_JFH_SKPERSON = #{VC_JFH_SKPERSON},
+            </if>
+            <if test="D_JFH_SKDATE != null and D_JFH_SKDATE != ''">
+                D_JFH_SKDATE = #{D_JFH_SKDATE},
+            </if>
+            <if test="VC_JFD_SKTYPE != null and VC_JFD_SKTYPE != ''">
+                VC_JFD_SKTYPE = #{VC_JFD_SKTYPE},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+
     <insert id="add_guiji_gas_Zenner_meter_reading_infor" parameterType="com.sooka.model.bo.Guiji_gas4_Zenner_meter_reading_infor_Bean">
         insert into t_guiji_gas_zenner_meter_reading_infor (
         <include refid="global_name"></include>