From 932387f91f0baf8be1575fe510d3578d2382acba Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Thu, 16 Dec 2021 19:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentCheckServiceImpl.java      | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 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 8f66bb5f..e84a2622 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
@@ -18,12 +18,14 @@ import com.jero.common.util.PasswordUtil;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.mapper.PayMeetingSituationMapper;
+import com.jero.member.entity.PayMemberProject;
 import com.jero.member.entity.PayMemberProjectSubitem;
 import com.jero.member.entity.TbCertificatePayment;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.member.mapper.TbCertificatePaymentMapper;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
+import com.jero.member.service.IPayMemberProjectService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.payment.entity.PayPaymentRecord;
@@ -74,6 +76,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
     @Resource
     private PayMemberProjectSubitemMapper payMemberProjectSubitemMapper;
     @Resource
+    private IPayMemberProjectService memberProjectService;
+    @Resource
     private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
     @Resource
     private TbCertificatePaymentMapper certificatePaymentMapper;
@@ -174,8 +178,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
             throw new JeroBootException("有待完成的阶段信息");
         }
 
-        String principalId;
-        String project;
+        String principalId="";
+        String project="";
         switch (String.valueOf(payPaymentRecord.getProjectType())){
 
             // 普通项目
@@ -212,11 +216,15 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 //来款条件校验
                 payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
-                PayMemberProjectSubitem member = new PayMemberProjectSubitem();
-                member.setId(payPaymentRecord.getProjectId());
+                PayMemberProjectSubitem member = payMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
+                PayMemberProject payMemberProject = memberProjectService.getById(member.getProjectId());
+
                 member.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payMemberProjectSubitemMapper.updateById(member);
 
+                //发消息参数
+                principalId = payMemberProject.getDirectorId();
+                project = payMemberProject.getProjectName();
                 break;
             default:break;
         }
@@ -229,9 +237,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
         PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
         BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
+        payPaymentRecordSub.setId(null);
+        payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
         payPaymentCheckMapper.insert(payPaymentRecordSub);
 
-//        uploadSendMessage();
+        //发消息
+        uploadSendMessage(principalId,project,String.valueOf(payPaymentRecord.getProjectType()));
     }
 
     /**
@@ -302,6 +313,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
         BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
         payPaymentRecordSub.setId(null);
+        payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
         payPaymentCheckMapper.insert(payPaymentRecordSub);
     }
 
@@ -406,6 +418,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         BigDecimal newPaidAmount;
         Integer inAccount;
         String paymentStatus;
+        String principalId="";
+        String project="";
 
         switch (String.valueOf(payPaymentRecord.getProjectType())){
 
@@ -425,6 +439,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
                 }else{
                     paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
+                    //发消息参数
+                    principalId = payCommonProject.getId();
+                    project=payCommonProject.getChargeProject();
+//                    checkSendMessage(userId, projectId, projectName, projectType)
                 }
 
                 payCommonProject.setPaymentStatus(paymentStatus);
@@ -438,6 +456,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
                 PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
+                PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
 
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
@@ -448,6 +467,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
                 }else{
                     paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
+                    //发消息参数
+                    principalId = payWorkingGroup.getPrincipalIdA();
+                    project = payWorkingGroup.getWorkingGroupProject();
                 }
 
                 payWorking.setPaymentStatus(paymentStatus);
@@ -461,6 +483,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
                 PayMemberProjectSubitem member = payMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
+                PayMemberProject payMemberProject = memberProjectService.getById(member.getProjectId());
 
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
@@ -471,6 +494,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     paymentStatus = getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
                 }else{
                     paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
+                    //发消息参数
+                    principalId = payMemberProject.getDirectorId();
+                    project = payMemberProject.getProjectName();
                 }
 
                 member.setPaymentStatus(paymentStatus);