1、修改退货收款

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -296,7 +296,8 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         saleReturnOutboundInsert(outboundVO);
       //新建退款
         RecPayVO recPayVO = new RecPayVO();
-        recPayVO.setObjectId(outboundVO.getObjectId());
+        recPayVO.setObjectId(outboundVO.getCusId());
+        recPayVO.setCusPhone(outboundVO.getCusPhone());
         recPayVO.setOrgId(outboundVO.getOrgId());
         recPayVO.setStaffId(outboundVO.getStaffId());
         recPayVO.setAccDate(outboundVO.getAccDate());

src/main/java/com/dk/mdm/service/mac/ReceiptService.java

@@ -340,10 +340,17 @@ public class ReceiptService extends BaseService<RecPay> {
 
         // 更新账款总表上收款的相关字段
         Account accountUpdate = new Account();
-        accountUpdate.setReceipt(accountForUpdate.getReceipt().add(recPayVO.getSumAmtRec()))// 总收款金额
-                .setReceiptResidue(accountForUpdate.getReceiptResidue().add(recPayVO.getSumAmtRec()))//  可退金额
-                .setObjectId(accountForUpdate.getObjectId());
-        accountService.updateByUuid(accountUpdate);
+        // 新建
+        if(accountForUpdate == null ){
+            // TODO 退货新客户插入的问题
+        }else{
+            // 说明已经存在
+            accountUpdate.setReceipt(accountForUpdate.getReceipt().add(recPayVO.getSumAmtRec()))// 总收款金额
+                    .setReceiptResidue(accountForUpdate.getReceiptResidue().add(recPayVO.getSumAmtRec()))//  可退金额
+                    .setObjectId(accountForUpdate.getObjectId());
+            accountService.updateByUuid(accountUpdate);
+        }
+
         return ResponseResultUtil.success();
     }