From 2575a6d6f18ea2d648ca2e97ebc147af7188c22a Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Wed, 22 Dec 2021 17:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=EF=BC=8C=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=E5=AE=A1=E6=A0=B8=EF=BC=8C=E9=99=A4=E4=BA=86=E5=8F=91?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=85=B6=E4=BB=96=E5=9F=BA=E6=9C=AC=E8=83=BD?=
 =?UTF-8?q?=E8=B7=91=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentCheckServiceImpl.java      | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 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 6b2517bf..b988beaa 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
@@ -438,7 +438,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
         BigDecimal newPaidAmount;
         Integer inAccount;
-        String paymentStatus=PaymentStatusEnum.TO_BE_REVIEWED.getCode();
+        String paymentStatus;
         String principalId="";
         String project="";
         List<PayContactsManagementTemporary> listId = new ArrayList<>();
@@ -453,6 +453,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     throw new JeroBootException("只有待审核的才可以审核");
                 }
 
+                principalId = payCommonProject.getPrincipalId();
+                project=payCommonProject.getChargeProject();
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
                     newPaidAmount = payPaymentRecordService.addPaidAmount(payCommonProject.getPaidAmount(), payPaymentRecord.getAmountReceived());//累加实收
@@ -460,11 +462,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     payCommonProject.setPaidAmount(newPaidAmount);
                     payCommonProject.setInAccount(inAccount);
                     paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                    //发消息
+                    payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
                 }else{
                     paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
-                    //发消息参数
-                    principalId = payCommonProject.getId();
-                    project=payCommonProject.getChargeProject();
+                    //发消息
+                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
                 }
 
                 payCommonProject.setPaymentStatus(paymentStatus);
@@ -481,6 +484,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     throw new JeroBootException("只有待审核的才可以审核");
                 }
 
+                principalId = payWorkingGroup.getPrincipalIdA();
+                project = payWorkingGroup.getWorkingGroupProject();
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
                     newPaidAmount =payPaymentRecordService.addPaidAmount(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
@@ -488,11 +493,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     payWorking.setPaidAmount(newPaidAmount);
                     payWorking.setInAccount(inAccount);
                     paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                    //发消息
+                    payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
                 }else{
                     paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
-                    //发消息参数
-                    principalId = payWorkingGroup.getPrincipalIdA();
-                    project = payWorkingGroup.getWorkingGroupProject();
+                    //发消息
+                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
                 }
 
                 payWorking.setPaymentStatus(paymentStatus);
@@ -509,6 +515,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     throw new JeroBootException("只有待审核的才可以审核");
                 }
 
+                //发消息参数
+                principalId = payMemberProject.getDirectorId();
+                project = payMemberProject.getProjectName();
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
                     newPaidAmount =payPaymentRecordService.addPaidAmount(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
@@ -516,11 +525,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     member.setPaidAmount(newPaidAmount);
                     member.setInAccount(inAccount);
                     paymentStatus = getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
+                    // 发消息
+                    payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
                 }else{
                     paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
-                    //发消息参数
-                    principalId = payMemberProject.getDirectorId();
-                    project = payMemberProject.getProjectName();
                 }
 
                 member.setPaymentStatus(paymentStatus);
@@ -537,6 +545,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     throw new JeroBootException("只有待审核的才可以审核");
                 }
 
+                //发消息参数
+                principalId = tbMemberProject.getDirectorId();
+                project = tbMemberProject.getProjectName();
+
                 TbCheckVo tbCheckVo = new TbCheckVo();
 
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
@@ -552,11 +564,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     payPaymentRecordMapper.insert(payPaymentRecord);
 
                     tbCheckVo.setCheckResult(PayProjectCommon.YES);
+                    //发消息
+                    payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
                 }else{
                     paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
-                    //发消息参数
-                    principalId = tbMemberProject.getDirectorId();
-                    project = tbMemberProject.getProjectName();
 
                     tbCheckVo.setCheckResult(PayProjectCommon.NO);
                 }
@@ -581,6 +592,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(tbMemberCertificate.getPaymentStatus())){
                     throw new JeroBootException("只有待审核的才可以审核");
                 }
+                //发消息参数
+                principalId = tbMemberProjectCertificate.getDirectorId();
+                project = tbMemberProjectCertificate.getProjectName();
 
                 TbCheckVo tbCheckCerVo = new TbCheckVo();
 
@@ -604,12 +618,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                         PayContactsManagementTemporary meetingTemporaryCer = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
                         listId.add(meetingTemporaryCer);
                     }
+                    //发消息
+                    payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
                 }else{
                     paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
-                    //发消息参数
-                    principalId = tbMemberProjectCertificate.getDirectorId();
-                    project = tbMemberProjectCertificate.getProjectName();
-
                     tbCheckCerVo.setCheckResult(PayProjectCommon.NO);
                 }
 
@@ -655,10 +667,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
         }
 
-        //通过消息
-//        payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
-//        //拒绝消息
-//        checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
     }
 
     /**