Merge branch 'master' of http://git.zthymaoyi.com/gongdc/uni_project

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/sys/CollectionPaymentServiceImpl.java

@@ -159,7 +159,18 @@ public class CollectionPaymentServiceImpl implements CollectionPaymentService {
                 insertDO.setGmtUpdate(now);
                 insertDO.setGmtCreate(now);
                 insertDO.setStatus(0);
+                insertDO.setPayNo(getlinkNo());
                 collectionPaymentMapper.insert(insertDO);
+                if ("1".equalsIgnoreCase(insertDO.getBusinessType())) {
+                    // 客户已付联动
+                    CustomerInfoDO customerInfoDO1 = new CustomerInfoDO();
+                    customerInfoDO1.setCustomer(insertDO.getReceivingWithdrawingPeople());
+                    CustomerInfoDO customerInfoDO = customerInfoMapper.selectOne(customerInfoDO1);
+                    if (customerInfoDO != null) {
+                        customerInfoDO.setUnpaidAmount(insertDO.getDeductionEuro()+(customerInfoDO.getUnpaidAmount()!= null?customerInfoDO.getUnpaidAmount():0));
+                    }
+                    customerInfoMapper.updateById(customerInfoDO);
+                }
             }
         }
     }

unimall-data/src/main/java/com/iotechn/unimall/data/dto/CollectionPaymentDTO.java

@@ -24,7 +24,7 @@ public class CollectionPaymentDTO extends SuperDTO {
 //    @Excel(name = "方式", readConverterExp = "1=收款,2=提款")
     /* 方式（1收2提） */
     private String businessType;
-    @Excel(name = "收款人")
+    @Excel(name = "付款人")
     /* 收提款人 */
     private String receivingWithdrawingPeople;
     @Excel(name = "收款地点")

unimall-data/src/main/java/com/iotechn/unimall/data/dto/CustomerBillingInfoDTO.java

@@ -29,7 +29,7 @@ public class CustomerBillingInfoDTO extends SuperDTO {
     @Excel(name = "客户")
     private String customer;
      /* 单据类型 */
-     @Excel(name = "单据类型")
+     @Excel(name = "单据类型",readConverterExp = "1=正常单据,2=结转单据")
     private String businessType;
      /* 结账日期 */
      @Excel(name = "装车日期")
@@ -38,10 +38,8 @@ public class CustomerBillingInfoDTO extends SuperDTO {
     @Excel(name = "应付金额")
     private Double amountIng;
      /* 已付金额 */
-     @Excel(name = "已付金额")
     private Double amountPaid;
      /* 未付金额 */
-     @Excel(name = "未付金额")
     private Double unpaidAmount;
      /* 备注1 */
      @Excel(name = "备注1")