From d4b09c098bfcd263d1f8f4f6d8300d4c8c087649 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Mon, 20 Dec 2021 18:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=88=B0=E6=A0=87=E5=8D=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentCheckServiceImpl.java      | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
index 31385eac..2a3ff238 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
@@ -414,24 +414,28 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         //来款条件校验
         payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
-        //更新来款记录主表
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
         payPaymentRecord.setReviewerId(sysUser.getId());
         payPaymentRecord.setReviewerName(sysUser.getRealname());
         payPaymentRecord.setReviewTime(new Date());
 
-        payPaymentRecordMapper.updateById(payPaymentRecord);
-        //更新来款记录表子表
-        PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
-        BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
+        if(PayIncomeContractCommon.PROJECT_TYPE1.equals(String.valueOf(payPaymentRecord.getProjectType())) ||
+                PayIncomeContractCommon.PROJECT_TYPE2.equals(String.valueOf(payPaymentRecord.getProjectType())) ||
+                        PayIncomeContractCommon.PROJECT_TYPE4.equals(String.valueOf(payPaymentRecord.getProjectType()))){
+            //更新来款记录主表
+            payPaymentRecordMapper.updateById(payPaymentRecord);
+            //更新来款记录表子表
+            PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
+            BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
 
-        payPaymentRecordSub.setId(null);
-        LambdaUpdateWrapper<PayPaymentRecordSub> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(PayPaymentRecordSub::getRecordId,payPaymentRecord.getId());
-        wrapper.eq(PayPaymentRecordSub::getProjectId,payPaymentRecord.getProjectId());
-        wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime);
-        wrapper.last("limit 1");
-        payPaymentCheckMapper.update(payPaymentRecordSub,wrapper);
+            payPaymentRecordSub.setId(null);
+            LambdaUpdateWrapper<PayPaymentRecordSub> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(PayPaymentRecordSub::getRecordId,payPaymentRecord.getId());
+            wrapper.eq(PayPaymentRecordSub::getProjectId,payPaymentRecord.getProjectId());
+            wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime);
+            wrapper.last("limit 1");
+            payPaymentCheckMapper.update(payPaymentRecordSub,wrapper);
+        }
 
         BigDecimal newPaidAmount;
         Integer inAccount;
@@ -527,6 +531,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     tbMember.setInAccount(inAccount);
                     paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
 
+                    //插入来款记录表
+                    payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
+                    payPaymentRecordMapper.insert(payPaymentRecord);
+
                     tbCheckVo.setCheckResult(PayProjectCommon.YES);
                 }else{
                     paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
@@ -564,6 +572,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     tbMemberCertificate.setInAccount(inAccount);
                     paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
 
+                    //插入来款记录表
+                    payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
+                    payPaymentRecordMapper.insert(payPaymentRecord);
+
                     tbCheckCerVo.setCheckResult(PayProjectCommon.YES);
                 }else{
                     paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态