From 3a2d61b63df3d68f0b31db7e23402c6ff4bb1abc Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Wed, 22 Dec 2021 14:18:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentCheckServiceImpl.java       | 13 ++++---------
 .../impl/PayPaymentRecordServiceImpl.java      | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 9 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 e1f43475..37832368 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
@@ -447,17 +447,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
             //更新来款记录主表
             payPaymentRecordMapper.updateById(payPaymentRecord);
             //更新来款记录表子表
-//            PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
-//            BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
-
-
             LambdaUpdateWrapper<PayPaymentRecordSub> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(PayPaymentRecordSub::getRecordId,payPaymentRecord.getId());
             wrapper.eq(PayPaymentRecordSub::getProjectId,payPaymentRecord.getProjectId());
             wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime);
-//            payPaymentCheckMapper.update(payPaymentRecordSub,wrapper);
-
             PayPaymentRecordSub sub = payPaymentCheckMapper.selectList(wrapper).get(0);
+
             sub.setRemark(payPaymentRecord.getRemark());
             sub.setPaymentStatus(payPaymentRecord.getPaymentStatus());
             sub.setReviewerId(payPaymentRecord.getReviewerId());
@@ -641,9 +636,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         }
 
         //通过消息
-        payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
-        //拒绝消息
-        checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
+//        payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
+//        //拒绝消息
+//        checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
     }
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index d42c1812..751e273f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -35,6 +35,7 @@ import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.mapper.PayPaymentRecordMapper;
+import com.jero.payment.service.IPayPaymentCheckService;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.payment.vo.TbCheckVo;
 import com.jero.project.common.PayProjectCommon;
@@ -56,6 +57,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -109,6 +111,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
     private ITbMemberProjectService tbMemberProjectService;
     @Resource
     private TbCertificatePaymentMapper certificatePaymentMapper;
+    @Autowired
+    private IPayPaymentCheckService payPaymentCheckService;
 
     @Value("${jero.path.upload}")
     private String upLoadPath;
@@ -287,6 +291,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
         BigDecimal newPaidAmount;
         Integer inAccount;
+        String paymentStatus;
         String principalId = "";
         String project = "";
         List<PayContactsManagementTemporary> listId = new ArrayList<>();
@@ -310,10 +315,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(payCommonProject.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(payCommonProject.getReceivableAmount(), newPaidAmount);//到账状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
 
                 //更新主列表
                 payCommonProject.setPaidAmount(newPaidAmount);
                 payCommonProject.setInAccount(inAccount);
+                payCommonProject.setPaymentStatus(paymentStatus);
                 payCommonProjectMapper.updateById(payCommonProject);
 
                 break;
@@ -344,10 +351,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(payWorking.getReceivableAmount(), newPaidAmount);//到账状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
 
                 //更新主列表
                 payWorking.setPaidAmount(newPaidAmount);
                 payWorking.setInAccount(inAccount);
+                payWorking.setPaymentStatus(paymentStatus);
                 payWorkingGroupSubItemMapper.updateById(payWorking);
                 
                 break;
@@ -368,10 +377,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
 
                 //更新主列表
                 meeting.setPaidAmount(newPaidAmount);
                 meeting.setInAccount(inAccount);
+                meeting.setPaymentStatus(paymentStatus);
                 payMeetingSituationMapper.updateById(meeting);
                
                 break;
@@ -390,10 +401,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(member.getAmountReceivable(), newPaidAmount);//到账状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+
 
                 //更新主列表
                 member.setPaidAmount(newPaidAmount);
                 member.setInAccount(inAccount);
+                member.setPaymentStatus(paymentStatus);
                 payMemberProjectSubitemMapper.updateById(member);
                     
                 break;
@@ -414,10 +428,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
 
                 //更新主列表
                 tbMember.setPaidAmount(newPaidAmount);
                 tbMember.setInAccount(inAccount);
+                tbMember.setPaymentStatus(paymentStatus);
                 tbMemberProjectSubitemMapper.updateById(tbMember);
 
                 //拼装推到标协缴费的参数
@@ -445,10 +461,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 newPaidAmount =addPaidAmount(tbMemberCertificate.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(tbMemberCertificate.getAmountReceivable(), newPaidAmount);//到账状态
+                paymentStatus = payPaymentCheckService.getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
 
                 //更新主列表
                 tbMemberCertificate.setPaidAmount(newPaidAmount);
                 tbMemberCertificate.setInAccount(inAccount);
+                tbMemberCertificate.setPaymentStatus(paymentStatus);
                 certificatePaymentMapper.updateById(tbMemberCertificate);
 
                 //拼装推到标协缴费的参数