update 修改待确收金额后 同时修改缴费凭证状态

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -596,7 +596,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             payPaymentRecord.setProjectId(payMeetingSituation.getId());
             payPaymentRecord.setProof(payMeetingSituation.getPaymentRecord());
             payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3));
-            payPaymentRecord.setAmountReceived(payMeetingSituation.getAmountReceivable());
+            payPaymentRecord.setAmountReceived(payMeetingSituation.getAmountReceivable().subtract(payMeetingSituation.getPaidAmount()));
             payPaymentRecord.setPaymentDate(new Date());
             payPaymentRecords.add(payPaymentRecord);
             //添加来款

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java

@@ -1261,6 +1261,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
         //到账金额
         BigDecimal paidAmount;
+        //缴费凭证状态
+        String paymentStatus;
         //确认收入金额
         BigDecimal confirmAmount;
         //开票金额
@@ -1299,6 +1301,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payCommonProject.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                payCommonProject.setPaymentStatus(paymentStatus);
                 payCommonProject.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1328,6 +1332,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payWorking.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                payWorking.setPaymentStatus(paymentStatus);
                 payWorking.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1357,6 +1363,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 meetingSituation.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                meetingSituation.setPaymentStatus(paymentStatus);
                 meetingSituation.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1386,6 +1394,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 member.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                member.setPaymentStatus(paymentStatus);
                 member.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1415,6 +1425,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 projectSubitem.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                projectSubitem.setPaymentStatus(paymentStatus);
                 projectSubitem.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
@@ -1446,6 +1458,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 payPackCompany.setTax(receivableAmount.subtract(noTaxAmount));
                 //到账状态
                 inAccount = getInAccount(receivableAmount, paidAmount);
+                //paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                //payPackCompany.set(paymentStatus);
                 payPackCompany.setInAccount(inAccount);
                 //确认收入状态
                 affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);