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

@@ -117,7 +117,7 @@ public class CollectionPaymentServiceImpl implements CollectionPaymentService {
                 customerInfoDO1.setCustomer(insertDO.getReceivingWithdrawingPeople());
                 CustomerInfoDO customerInfoDO = customerInfoMapper.selectOne(customerInfoDO1);
                 if (customerInfoDO != null) {
-                    customerInfoDO.setYiAmount(customerInfoDO.getYiAmount()+insertDO.getDeductionEuro());
+                    customerInfoDO.setUnpaidAmount(insertDO.getDeductionEuro()+(customerInfoDO.getUnpaidAmount()!= null?customerInfoDO.getUnpaidAmount():0));
                 }
                 customerInfoMapper.updateById(customerInfoDO);
             }

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

@@ -58,7 +58,7 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
 
                 }
                 customerInfoDO.setAmountPayable(sum);
-                customerInfoDO.setUnpaidAmount(customerInfoDO.getYiAmount()-sum);
+                customerInfoDO.setSyAmount((customerInfoDO.getUnpaidAmount()!=null?customerInfoDO.getUnpaidAmount():0)-sum);
 
             }
 

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CustomerInfoDO.java

@@ -18,15 +18,15 @@ public class CustomerInfoDO extends SuperDO {
      /* 客户 */
     @TableField("customer")
     private String customer;
-     /* 账户余额 */
+     /* 已付金额 */
     @TableField("unpaid_amount")
     private Double unpaidAmount;
     /* 应付金额 */
     @TableField(exist = false)
     private Double amountPayable;
-    /* 已付金额 */
+    /* 余额 */
     @TableField(exist = false)
-    private Double yiAmount;
+    private Double syAmount;
      /* 备注 */
     @TableField("remarks")
     private String remarks;