From 263f20baefc24d13b77e38f6b0d7ec6d524b790e Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Thu, 16 Dec 2021 18:53:59 +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      | 159 ++----------------
 1 file changed, 18 insertions(+), 141 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 c8438053..8f66bb5f 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
@@ -37,6 +37,7 @@ import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
+import com.jero.project.service.IPayWorkingGroupService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -84,6 +85,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
     private SendMessageService sendMessageService;
     @Resource
     private ISysBaseAPI sysBaseAPI;
+    @Resource
+    private IPayWorkingGroupService payWorkingGroupService;
 
     /**
      *  来款列表
@@ -171,8 +174,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
             throw new JeroBootException("有待完成的阶段信息");
         }
 
-        String projectId;
-        String projectName;
+        String principalId;
+        String project;
         switch (String.valueOf(payPaymentRecord.getProjectType())){
 
             // 普通项目
@@ -180,41 +183,29 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 //来款条件校验
                 payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
-                PayCommonProject payCommonProject = new PayCommonProject();
-                payCommonProject.setId(payPaymentRecord.getProjectId());
+                PayCommonProject payCommonProject = payCommonProjectMapper.selectById(payPaymentRecord.getProjectId());
+
                 payCommonProject.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payCommonProjectMapper.updateById(payCommonProject);
-//
-//                projectId = payCommonProject.getId();
-//                projectName=payCommonProject.getChargeProject();
+
+                //发消息参数
+                principalId = payCommonProject.getId();
+                project=payCommonProject.getChargeProject();
                 break;
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
                 //来款条件校验
                 payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
-                PayWorkingGroupSubItem payWorking = new PayWorkingGroupSubItem();
-//                PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
+                PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
+                PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
 
-                payWorking.setId(payPaymentRecord.getProjectId());
                 payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payWorkingGroupSubItemMapper.updateById(payWorking);
 
-//                projectId = payWorking.getId();
-//                projectName=payWorking.getChargeProject();
-                break;
-            //会议项目
-            case PayIncomeContractCommon.PROJECT_TYPE3:
-                //来款条件校验
-                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
-
-                PayMeetingSituation meeting = new PayMeetingSituation();
-                meeting.setId(payPaymentRecord.getProjectId());
-                meeting.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
-                payMeetingSituationMapper.updateById(meeting);
-//
-//                projectId = meeting.getId();
-//                projectName=meeting.getChargeProject();
+                //发消息参数
+                principalId = payWorkingGroup.getPrincipalIdA();
+                project = payWorkingGroup.getWorkingGroupProject();
                 break;
             //会员项目
             case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -226,32 +217,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 member.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payMemberProjectSubitemMapper.updateById(member);
 
-                break;
-            //标协会员
-            case PayIncomeContractCommon.PROJECT_TYPE5:
-                //标协类型条件校验
-                payPaymentRecordService.type5AddCheck(payPaymentRecord);
-                //来款条件校验
-                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
-
-                TbMemberProjectSubitem tbMember= new TbMemberProjectSubitem();
-                tbMember.setId(payPaymentRecord.getProjectId());
-                tbMember.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
-                tbMemberProjectSubitemMapper.updateById(tbMember);
-                
-                break;
-            //标协证书
-            case PayIncomeContractCommon.PROJECT_TYPE6:
-                //标协类型条件校验
-                payPaymentRecordService.type6AddCheck(payPaymentRecord);
-                //来款条件校验
-                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
-
-                TbCertificatePayment certificatePayment= new TbCertificatePayment();
-                certificatePayment.setId(payPaymentRecord.getProjectId());
-                certificatePayment.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
-                certificatePaymentMapper.updateById(certificatePayment);
-
                 break;
             default:break;
         }
@@ -274,7 +239,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
      * @param payPaymentRecord
      */
     public void delete(PayPaymentRecord payPaymentRecord){
-        if(PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
+        if(!PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
             throw new JeroBootException("只有拒绝的才可删除");
         }
         payPaymentRecordMapper.deleteById(payPaymentRecord.getId());
@@ -285,7 +250,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
      * @param payPaymentRecord
      */
     public void edit(PayPaymentRecord payPaymentRecord){
-        if(PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
+        if(!PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
             throw new JeroBootException("只有拒绝的才可编辑");
         }
 
@@ -312,19 +277,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payWorkingGroupSubItemMapper.updateById(payWorking);
 
-//                projectId = payWorking.getId();
-//                projectName=payWorking.getChargeProject();
-                break;
-            //会议项目
-            case PayIncomeContractCommon.PROJECT_TYPE3:
-                //来款条件校验
-                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
-
-                PayMeetingSituation meeting = new PayMeetingSituation();
-                meeting.setId(payPaymentRecord.getProjectId());
-                meeting.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
-                payMeetingSituationMapper.updateById(meeting);
-
                 break;
             //会员项目
             case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -336,32 +288,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 member.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payMemberProjectSubitemMapper.updateById(member);
 
-                break;
-            //标协会员
-            case PayIncomeContractCommon.PROJECT_TYPE5:
-                //标协类型条件校验
-                payPaymentRecordService.type5AddCheck(payPaymentRecord);
-                //来款条件校验
-                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
-
-                TbMemberProjectSubitem tbMember= new TbMemberProjectSubitem();
-                tbMember.setId(payPaymentRecord.getProjectId());
-                tbMember.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
-                tbMemberProjectSubitemMapper.updateById(tbMember);
-
-                break;
-            //标协证书
-            case PayIncomeContractCommon.PROJECT_TYPE6:
-                //标协类型条件校验
-                payPaymentRecordService.type6AddCheck(payPaymentRecord);
-                //来款条件校验
-                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
-
-                TbCertificatePayment certificatePayment= new TbCertificatePayment();
-                certificatePayment.setId(payPaymentRecord.getProjectId());
-                certificatePayment.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
-                certificatePaymentMapper.updateById(certificatePayment);
-
                 break;
             default:break;
         }
@@ -477,7 +403,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         wrapper.eq(PayPaymentRecordSub::getProjectId,payPaymentRecord.getProjectId());
         payPaymentCheckMapper.update(payPaymentRecordSub,wrapper);
 
-        //通过
         BigDecimal newPaidAmount;
         Integer inAccount;
         String paymentStatus;
@@ -529,29 +454,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 //更新主列表
                 payWorkingGroupSubItemMapper.updateById(payWorking);
 
-                break;
-            //会议项目
-            case PayIncomeContractCommon.PROJECT_TYPE3:
-                //来款条件校验
-                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
-
-                PayMeetingSituation meeting = payMeetingSituationMapper.selectById(payPaymentRecord.getProjectId());
-
-                if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
-                    //已同意
-                    newPaidAmount =payPaymentRecordService.addPaidAmount(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
-                    inAccount = payPaymentRecordService.getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
-                    meeting.setPaidAmount(newPaidAmount);
-                    meeting.setInAccount(inAccount);
-                    paymentStatus = getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
-                }else{
-                    paymentStatus = getPaymentStatus(meeting.getAmountReceivable(), meeting.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
-                }
-
-                meeting.setPaymentStatus(paymentStatus);
-                //更新主列表
-                payMeetingSituationMapper.updateById(meeting);
-
                 break;
             //会员项目
             case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -575,31 +477,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 //更新主列表
                 payMemberProjectSubitemMapper.updateById(member);
 
-                break;
-            //标协会员
-            case PayIncomeContractCommon.PROJECT_TYPE5:
-                //标协类型条件校验
-                payPaymentRecordService.type5AddCheck(payPaymentRecord);
-                //来款条件校验
-                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
-
-                TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
-
-                if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
-                    //已同意
-                    newPaidAmount =payPaymentRecordService.addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
-                    inAccount = payPaymentRecordService.getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
-                    tbMember.setPaidAmount(newPaidAmount);
-                    tbMember.setInAccount(inAccount);
-                    paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
-                }else{
-                    paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
-                }
-
-                tbMember.setPaymentStatus(paymentStatus);
-                //更新主列表
-                tbMemberProjectSubitemMapper.updateById(tbMember);
-
                 break;
             default:break;
         }