1

pro-base/src/main/java/com/idea/customerManagement/service/CustomerManagementService.java

@@ -215,40 +215,40 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         model.setCreatedId(userId);
         int result = insertWithOutId(model);
 
-        try {
-            // 给nc推送客户数据
-            JSONObject json = new JSONObject();
-            json.put("srcsystemid", id);
-            json.put("name", builder.toString());
-            json.put("pk_custclass", "02"); //客户基本分类 ，，（默认是02），必选，01内部客户，02外部客户
-            json.put("custprop", "0");//财务组织客户类型，必选，默认0
-            json.put("taxpayerid",identityCardBuilder.toString() ); //统一社会信用代码，必选
-            String resultJson = InvoiceUtil.customerAdd(json);
-            JSONObject jsonObject = JSONObject.parseObject(resultJson);
-            String success = jsonObject.getString("success");
-            if (success.equals("true")) {
-                JSONObject data = jsonObject.getJSONObject("data");
-                String code = data.getString("code");
-                String ncid = data.getString("ncid");
-                CustomerManagement record = new CustomerManagement();
-                record.setId(id);
-                record.setNcid(ncid);
-                record.setNcCode(code);
-                updateByPrimaryKeySelective(record);
-            }
-        }catch (Exception e){
-            log.error("推送客户失败",e);
-        }
-
-        try {
-            // 客户分配
-            JSONObject json = new JSONObject();
-            json.put("pk_org", InvoiceUtil.pk_org);
-            json.put("ncid", identityCardBuilder.toString());
-            InvoiceUtil.customerAssign(json);
-        }catch (Exception e){
-            log.error("客户分配失败",e);
-        }
+//        try {
+//            // 给nc推送客户数据
+//            JSONObject json = new JSONObject();
+//            json.put("srcsystemid", id);
+//            json.put("name", builder.toString());
+//            json.put("pk_custclass", "02"); //客户基本分类 ，，（默认是02），必选，01内部客户，02外部客户
+//            json.put("custprop", "0");//财务组织客户类型，必选，默认0
+//            json.put("taxpayerid",identityCardBuilder.toString() ); //统一社会信用代码，必选
+//            String resultJson = InvoiceUtil.customerAdd(json);
+//            JSONObject jsonObject = JSONObject.parseObject(resultJson);
+//            String success = jsonObject.getString("success");
+//            if (success.equals("true")) {
+//                JSONObject data = jsonObject.getJSONObject("data");
+//                String code = data.getString("code");
+//                String ncid = data.getString("ncid");
+//                CustomerManagement record = new CustomerManagement();
+//                record.setId(id);
+//                record.setNcid(ncid);
+//                record.setNcCode(code);
+//                updateByPrimaryKeySelective(record);
+//            }
+//        }catch (Exception e){
+//            log.error("推送客户失败",e);
+//        }
+//
+//        try {
+//            // 客户分配
+//            JSONObject json = new JSONObject();
+//            json.put("pk_org", InvoiceUtil.pk_org);
+//            json.put("ncid", identityCardBuilder.toString());
+//            InvoiceUtil.customerAssign(json);
+//        }catch (Exception e){
+//            log.error("客户分配失败",e);
+//        }
 
         return result;
 
@@ -314,23 +314,23 @@ public class CustomerManagementService implements BaseService<CustomerManagement
 
         int result = updateByPrimaryKeySelective(model);
 
-        try {
-
-            // 修改客户数据
-            JSONObject json = new JSONObject();
-            json.put("ncid", oldCustomer.getBuyerIdentityCard());// 客户统一信用代码，必选
-            json.put("name", builder.toString());
-            json.put("pk_custclass", "02"); //客户基本分类 ，，（默认是02），必选，01内部客户，02外部客户
-            json.put("custprop", "0");//财务组织客户类型，必选，默认0
-            json.put("taxpayerid", identityCardBuilder.toString()); //统一社会信用代码，必选
-            String resultJson = InvoiceUtil.customerUpdate(json);
-            JSONObject jsonObject = JSONObject.parseObject(resultJson);
-            String success = jsonObject.getString("success");
-            if (success.equals("true")) {
-            }
-        }catch (Exception e){
-            log.error("修改客户失败",e);
-        }
+//        try {
+//
+//            // 修改客户数据
+//            JSONObject json = new JSONObject();
+//            json.put("ncid", oldCustomer.getBuyerIdentityCard());// 客户统一信用代码，必选
+//            json.put("name", builder.toString());
+//            json.put("pk_custclass", "02"); //客户基本分类 ，，（默认是02），必选，01内部客户，02外部客户
+//            json.put("custprop", "0");//财务组织客户类型，必选，默认0
+//            json.put("taxpayerid", identityCardBuilder.toString()); //统一社会信用代码，必选
+//            String resultJson = InvoiceUtil.customerUpdate(json);
+//            JSONObject jsonObject = JSONObject.parseObject(resultJson);
+//            String success = jsonObject.getString("success");
+//            if (success.equals("true")) {
+//            }
+//        }catch (Exception e){
+//            log.error("修改客户失败",e);
+//        }
 
         return result;
 

pro-base/src/main/java/com/idea/paymentManagement/dto/PayLogDto.java

@@ -35,6 +35,11 @@ public class PayLogDto extends PayLog {
 
     private String createdName;
 
+    /**
+     * 银行流水id
+     */
     private String pkInformerId;
 
+    private String payLogId;
+
 }

pro-base/src/main/java/com/idea/paymentManagement/mapper/PayLogExtendMapper.java

@@ -1,6 +1,7 @@
 package com.idea.paymentManagement.mapper;
 
 import com.idea.customerManagement.dto.ContractManageDto;
+import com.idea.paymentManagement.dto.PayLogDto;
 import com.idea.paymentManagement.model.PayLog;
 import com.idea.paymentManagement.model.PayLogExample;
 import org.apache.ibatis.annotations.Param;
@@ -12,8 +13,8 @@ public interface PayLogExtendMapper {
     String getMoneyByContractId(@Param("contractId") String contractId,
                                 @Param("payType") Integer payType);
 
-    List<PayLog> getContentTypeMoneyByContractId(@Param("contractId") String contractId,
-                                @Param("payType") Integer payType);
+    List<PayLogDto> getContentTypeMoneyByContractId(@Param("contractId") String contractId,
+                                                    @Param("payType") Integer payType);
 
     List<ContractManageDto> listByModel(ContractManageDto contractManageDto);
 

pro-base/src/main/java/com/idea/paymentManagement/model/RefundDetail.java

@@ -40,6 +40,10 @@ public class RefundDetail implements Serializable {
 
     private String ncJson;
 
+    private String payLogId;
+
+    private String serialNumber;
+
     private static final long serialVersionUID = 1L;
 
 }

pro-base/src/main/java/com/idea/paymentManagement/model/RefundDetailExample.java

@@ -1065,6 +1065,146 @@ public class RefundDetailExample {
             addCriterion("is_hide not between", value1, value2, "isHide");
             return (Criteria) this;
         }
+
+        public Criteria andPayLogIdIsNull() {
+            addCriterion("pay_log_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdIsNotNull() {
+            addCriterion("pay_log_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdEqualTo(String value) {
+            addCriterion("pay_log_id =", value, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdNotEqualTo(String value) {
+            addCriterion("pay_log_id <>", value, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdGreaterThan(String value) {
+            addCriterion("pay_log_id >", value, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdGreaterThanOrEqualTo(String value) {
+            addCriterion("pay_log_id >=", value, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdLessThan(String value) {
+            addCriterion("pay_log_id <", value, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdLessThanOrEqualTo(String value) {
+            addCriterion("pay_log_id <=", value, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdLike(String value) {
+            addCriterion("pay_log_id like", value, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdNotLike(String value) {
+            addCriterion("pay_log_id not like", value, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdIn(List<String> values) {
+            addCriterion("pay_log_id in", values, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdNotIn(List<String> values) {
+            addCriterion("pay_log_id not in", values, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdBetween(String value1, String value2) {
+            addCriterion("pay_log_id between", value1, value2, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayLogIdNotBetween(String value1, String value2) {
+            addCriterion("pay_log_id not between", value1, value2, "payLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberIsNull() {
+            addCriterion("serial_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberIsNotNull() {
+            addCriterion("serial_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberEqualTo(String value) {
+            addCriterion("serial_number =", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberNotEqualTo(String value) {
+            addCriterion("serial_number <>", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberGreaterThan(String value) {
+            addCriterion("serial_number >", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("serial_number >=", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberLessThan(String value) {
+            addCriterion("serial_number <", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberLessThanOrEqualTo(String value) {
+            addCriterion("serial_number <=", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberLike(String value) {
+            addCriterion("serial_number like", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberNotLike(String value) {
+            addCriterion("serial_number not like", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberIn(List<String> values) {
+            addCriterion("serial_number in", values, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberNotIn(List<String> values) {
+            addCriterion("serial_number not in", values, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberBetween(String value1, String value2) {
+            addCriterion("serial_number between", value1, value2, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberNotBetween(String value1, String value2) {
+            addCriterion("serial_number not between", value1, value2, "serialNumber");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

pro-base/src/main/java/com/idea/paymentManagement/service/RefundDetailService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil;
 import com.idea.customerManagement.mapper.ContractManageMapper;
 import com.idea.customerManagement.model.ContractManage;
 import com.idea.customerManagement.model.ContractManageExample;
+import com.idea.paymentManagement.dto.PayLogDto;
 import com.idea.paymentManagement.dto.RefundDetailDto;
 import com.idea.paymentManagement.mapper.PayLogExtendMapper;
 import com.idea.paymentManagement.mapper.PayLogMapper;
@@ -102,8 +103,8 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
         ContractManage contractManage = contractManages.get(0);
 
         List<Map<String, String>> dictList = sysDictService.selectDictList("CONTENT_TYPE");
-        List<PayLog> contentTypeMoney = payLogExtendMapper.getContentTypeMoneyByContractId(contractManage.getId(), 1);
-        for (PayLog payLog : contentTypeMoney) {
+        List<PayLogDto> contentTypeMoney = payLogExtendMapper.getContentTypeMoneyByContractId(contractManage.getId(), 1);
+        for (PayLogDto payLog : contentTypeMoney) {
             String type = "";
             for (Map<String, String> map : dictList){
                 if(map.get("value").equals(payLog.getContentType().toString())){
@@ -115,6 +116,8 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
             refundDetail.setContentType(payLog.getContentType());
             refundDetail.setReceivedAmount(payLog.getPayMoney());
             refundDetail.setUuid(IdUtil.simpleUUID());
+            refundDetail.setPayLogId(payLog.getPayLogId());
+            refundDetail.setSerialNumber(payLog.getSerialNumber());
             refundDetails.add(refundDetail);
         }
 

pro-base/src/main/resources/mybatis/paymentManagement/PayLogExtendMapper.xml

@@ -50,8 +50,10 @@
         </where>
     </select>
 
-    <select id="getContentTypeMoneyByContractId" resultType="com.idea.paymentManagement.model.PayLog">
-        select content_type,ifnull(sum(pay_money),0) as pay_money from pay_log
+    <select id="getContentTypeMoneyByContractId" resultType="com.idea.paymentManagement.dto.PayLogDto">
+        select content_type,ifnull(sum(pay_money),0) as pay_money,concat(pay_log.id,'') as pay_log_id,
+               concat(pay_log.serial_number) as serial_number
+        from pay_log
         <where>
             and ifnull(is_hide,0) != 1
             <if test="contractId != null and contractId !=''">

pro-base/src/main/resources/mybatis/paymentManagement/RefundDetailMapper.xml

@@ -17,6 +17,8 @@
     <result column="nc_submit_date" jdbcType="TIMESTAMP" property="ncSubmitDate" />
     <result column="nc_submit_name" jdbcType="VARCHAR" property="ncSubmitName" />
     <result column="is_hide" jdbcType="INTEGER" property="isHide" />
+    <result column="pay_log_id" jdbcType="VARCHAR" property="payLogId" />
+    <result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.paymentManagement.model.RefundDetail">
     <result column="nc_json" jdbcType="LONGVARCHAR" property="ncJson" />
@@ -82,7 +84,7 @@
   <sql id="Base_Column_List">
     id, refund_manage_id, type, content_type, received_amount, deductible, actual_refund_amount,
     created_id, created_at, updated_at, updated_id, nc_submit_status, nc_submit_date,
-    nc_submit_name, is_hide
+    nc_submit_name, is_hide, pay_log_id, serial_number
   </sql>
   <sql id="Blob_Column_List">
     nc_json
@@ -141,13 +143,15 @@
                                actual_refund_amount, created_id, created_at,
                                updated_at, updated_id, nc_submit_status,
                                nc_submit_date, nc_submit_name, is_hide,
-                               nc_json)
+                               pay_log_id, serial_number, nc_json
+    )
     values (#{id,jdbcType=VARCHAR}, #{refundManageId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
             #{contentType,jdbcType=INTEGER}, #{receivedAmount,jdbcType=DECIMAL}, #{deductible,jdbcType=DECIMAL},
             #{actualRefundAmount,jdbcType=DECIMAL}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
             #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{ncSubmitStatus,jdbcType=INTEGER},
             #{ncSubmitDate,jdbcType=TIMESTAMP}, #{ncSubmitName,jdbcType=VARCHAR}, #{isHide,jdbcType=INTEGER},
-            #{ncJson,jdbcType=LONGVARCHAR})
+            #{payLogId,jdbcType=VARCHAR}, #{serialNumber,jdbcType=VARCHAR}, #{ncJson,jdbcType=LONGVARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.paymentManagement.model.RefundDetail">
     insert into refund_detail
@@ -197,6 +201,12 @@
       <if test="isHide != null">
         is_hide,
       </if>
+      <if test="payLogId != null">
+        pay_log_id,
+      </if>
+      <if test="serialNumber != null">
+        serial_number,
+      </if>
       <if test="ncJson != null">
         nc_json,
       </if>
@@ -247,6 +257,12 @@
       <if test="isHide != null">
         #{isHide,jdbcType=INTEGER},
       </if>
+      <if test="payLogId != null">
+        #{payLogId,jdbcType=VARCHAR},
+      </if>
+      <if test="serialNumber != null">
+        #{serialNumber,jdbcType=VARCHAR},
+      </if>
       <if test="ncJson != null">
         #{ncJson,jdbcType=LONGVARCHAR},
       </if>
@@ -306,6 +322,12 @@
       <if test="record.isHide != null">
         is_hide = #{record.isHide,jdbcType=INTEGER},
       </if>
+      <if test="record.payLogId != null">
+        pay_log_id = #{record.payLogId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serialNumber != null">
+        serial_number = #{record.serialNumber,jdbcType=VARCHAR},
+      </if>
       <if test="record.ncJson != null">
         nc_json = #{record.ncJson,jdbcType=LONGVARCHAR},
       </if>
@@ -331,6 +353,8 @@
     nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
     nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
     is_hide = #{record.isHide,jdbcType=INTEGER},
+    pay_log_id = #{record.payLogId,jdbcType=VARCHAR},
+    serial_number = #{record.serialNumber,jdbcType=VARCHAR},
     nc_json = #{record.ncJson,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -352,7 +376,9 @@
     nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
     nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
     nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
-    is_hide = #{record.isHide,jdbcType=INTEGER}
+    is_hide = #{record.isHide,jdbcType=INTEGER},
+    pay_log_id = #{record.payLogId,jdbcType=VARCHAR},
+    serial_number = #{record.serialNumber,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -402,6 +428,12 @@
       <if test="isHide != null">
         is_hide = #{isHide,jdbcType=INTEGER},
       </if>
+      <if test="payLogId != null">
+        pay_log_id = #{payLogId,jdbcType=VARCHAR},
+      </if>
+      <if test="serialNumber != null">
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
+      </if>
       <if test="ncJson != null">
         nc_json = #{ncJson,jdbcType=LONGVARCHAR},
       </if>
@@ -424,6 +456,8 @@
         nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
         is_hide = #{isHide,jdbcType=INTEGER},
+        pay_log_id = #{payLogId,jdbcType=VARCHAR},
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
         nc_json = #{ncJson,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -442,7 +476,9 @@
         nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
         nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
-        is_hide = #{isHide,jdbcType=INTEGER}
+        is_hide = #{isHide,jdbcType=INTEGER},
+        pay_log_id = #{payLogId,jdbcType=VARCHAR},
+        serial_number = #{serialNumber,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>