From 810dc18c87b1aa6cb3a7f256f06704122b8e78cc Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Fri, 17 Dec 2021 13:46:18 +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

---
 .../service/impl/PayPaymentCheckServiceImpl.java       | 10 ++++++----
 .../service/impl/PayPaymentRecordServiceImpl.java      |  2 ++
 2 files changed, 8 insertions(+), 4 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 e84a2622..e0d88581 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
@@ -439,10 +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)
+                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId, project, PayIncomeContractCommon.PROJECT_TYPE1);
                 }
 
                 payCommonProject.setPaymentStatus(paymentStatus);
@@ -467,9 +467,10 @@ 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();
+                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId, project, PayIncomeContractCommon.PROJECT_TYPE2);
                 }
 
                 payWorking.setPaymentStatus(paymentStatus);
@@ -494,9 +495,10 @@ 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();
+                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId, project, PayIncomeContractCommon.PROJECT_TYPE4);
                 }
 
                 member.setPaymentStatus(paymentStatus);
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 16a9408a..cecfb3c5 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
@@ -10,6 +10,7 @@ import com.jero.common.common.ProjectCommon;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.enums.ManagementMessageEnums;
+import com.jero.common.enums.PaymentStatusEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -482,6 +483,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         tbMember.setMemberNo(memberInfo.getMemberNo());
         tbMember.setMemberType(memberInfo.getMemberType());
         tbMember.setMemberStatus(memberInfo.getMemberStatus());
+        tbMember.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
         tbMemberProjectSubitemMapper.updateById(tbMember);
 
         //插入来款记录表