From 7a8ed8cd02882bcc550a5f433ef3976438937e10 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Fri, 24 Dec 2021 10:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayContactsManagementController.java      |  6 +-
 .../service/impl/PayMailBillServiceImpl.java  | 25 ++++++-
 .../impl/PayPaymentCheckServiceImpl.java      | 67 +++++++++----------
 .../service/IMemberInfoService.java           |  3 +-
 .../service/impl/MemberInfoServiceImpl.java   |  5 +-
 5 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 55e5d776..4ea63b47 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -984,12 +984,14 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 @GetMapping(value = "/baseInfo")
 	 public Result<?> baseInfo() {
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
+			//查出来人
 		 LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
 		 queryPayContactsManagement.eq(PayContactsManagement::getPhone,sysUser.getUsername());
 		 PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement);
+		 //查出来企业
+		 PayCompanyManagement company = payCompanyManagementService.getById(contacts.getCompanyId());
 
-		 Map<String,Object> baseInfo = memberInfoService.baseInfo(contacts);
+		 Map<String,Object> baseInfo = memberInfoService.baseInfo(company);
 
 		 return Result.OK(baseInfo);
 	 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index 63c0ad8d..47635683 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -639,7 +639,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                         return "报名信息未审核，需要审核后开票";
                     }
                     PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
-                    if(!Objects.isNull(payCompanyManagementMeeting) && "2".equals(payCompanyManagementMeeting.getStatus()) ){
+                    if(!Objects.isNull(payCompanyManagementMeeting) && payCompanyManagementMeeting.getStatus()==2 ){
                         return "企业未审核，需要审核后开票";
                     }
                     break;
@@ -689,7 +689,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                         return "开票金额应等于当前未开票金额，输入有误！";
                     }
                     PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
-                    if(!Objects.isNull(payCompanyManagementTbMember) && "2".equals(payCompanyManagementTbMember.getStatus()) ){
+                    if(!Objects.isNull(payCompanyManagementTbMember) && payCompanyManagementTbMember.getStatus()==2 ){
                         return "企业未审核，需要审核后开票";
                     }
                     if(1!=tbMemberProject.getInAccount()){
@@ -717,7 +717,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                         return "开票金额应等于当前未开票金额，输入有误！";
                     }
                     PayCompanyManagement payCompanyManagementTbMemberCer = payCompanyManagementService.getById(tbMemberCertificate.getCompanyId());
-                    if(!Objects.isNull(payCompanyManagementTbMemberCer) && "2".equals(payCompanyManagementTbMemberCer.getStatus()) ){
+                    if(!Objects.isNull(payCompanyManagementTbMemberCer) && payCompanyManagementTbMemberCer.getStatus()==2 ){
                         return "企业未审核，需要审核后开票";
                     }
                     if(1!=tbMemberCertificate.getInAccount()){
@@ -1080,6 +1080,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){
                     return "开票金额大于当前未开票金额，输入有误！";
                 }
+                PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagement) && "2".equals(payCompanyManagement.getStatus()) ){
+                    return "企业未审核，需要审核后开票";
+                }
                 break;
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -1098,6 +1102,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){
                     return "开票金额大于当前未开票金额，输入有误！";
                 }
+                PayCompanyManagementTemporary payCompanyManagementWorkingGroup = payCompanyManagementTemporaryService.getById(workingGroup.getChargeCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagementWorkingGroup) && "2".equals(payCompanyManagementWorkingGroup.getStatus()) ){
+                    return "企业未审核，需要审核后开票";
+                }
                 break;
             //会议项目
             case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -1116,6 +1124,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){
                     return "开票金额大于当前未开票金额，输入有误！";
                 }
+                PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
+                if(!Objects.isNull(payCompanyManagementMeeting) && payCompanyManagementMeeting.getStatus()==2 ){
+                    return "企业未审核，需要审核后开票";
+                }
                 break;
             //会员项目
             case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -1134,10 +1146,17 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){
                     return "开票金额大于当前未开票金额，输入有误！";
                 }
+                PayCompanyManagementTemporary payCompanyManagementMember = payCompanyManagementTemporaryService.getById(memberProject.getCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagementMember) && "2".equals(payCompanyManagementMember.getStatus()) ){
+                    return "企业未审核，需要审核后开票";
+                }
                 break;
             //标协会员
             case PayIncomeContractCommon.PROJECT_TYPE5:
                 return "标协会员类型不可编辑！";
+            //标协证书
+            case PayIncomeContractCommon.PROJECT_TYPE6:
+                return "标协证书类型不可编辑！";
             default:
                 break;
         }
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 7e5e5773..ce87485f 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
@@ -296,9 +296,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 payCommonProject.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payCommonProjectMapper.updateById(payCommonProject);
 
+                PayCommonProject oldPayCommonProject = payCommonProjectMapper.selectById(payPaymentRecord.getProjectId());
                 //发消息参数
-                principalId = payCommonProject.getPrincipalId();
-                project=payCommonProject.getChargeProject();
+                principalId = oldPayCommonProject.getPrincipalId();
+                project=oldPayCommonProject.getChargeProject();
                 break;
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -306,15 +307,16 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
                 PayWorkingGroupSubItem payWorking = new PayWorkingGroupSubItem();
-                PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
-
                 payWorking.setId(payPaymentRecord.getProjectId());
                 payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payWorkingGroupSubItemMapper.updateById(payWorking);
 
+                PayWorkingGroupSubItem oldPayWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
+                PayWorkingGroup oldPayWorkingGroup = payWorkingGroupService.getById(oldPayWorking.getWorkingGroupId());
+
                 //发消息参数
-                principalId = payWorkingGroup.getPrincipalIdA();
-                project = payWorkingGroup.getWorkingGroupProject();
+                principalId = oldPayWorkingGroup.getPrincipalIdA();
+                project = oldPayWorkingGroup.getWorkingGroupProject();
                 break;
             //会员项目
             case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -322,30 +324,28 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
                 PayMemberProjectSubitem member = new PayMemberProjectSubitem();
-                PayMemberProject payMemberProject = memberProjectService.getById(member.getProjectId());
 
                 member.setId(payPaymentRecord.getProjectId());
                 member.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
                 payMemberProjectSubitemMapper.updateById(member);
 
+                PayMemberProjectSubitem oldMember = payMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
+                PayMemberProject oldPayMemberProject = memberProjectService.getById(oldMember.getProjectId());
                 //发消息参数
-                principalId = payMemberProject.getDirectorId();
-                project = payMemberProject.getProjectName();
+                principalId = oldPayMemberProject.getDirectorId();
+                project = oldPayMemberProject.getProjectName();
                 break;
             default:break;
         }
 
+        //新增子表
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
         payPaymentRecord.setApplicantName(sysUser.getRealname());
         payPaymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
-//        payPaymentRecordMapper.updateById(payPaymentRecord);
-
-        //新增子表
-        PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
         payPaymentRecord.setCreateBy(sysUser.getUsername());
         payPaymentRecord.setCreateTime(new Date());
+        PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
         BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
-
         payPaymentRecordSub.setId(null);
         payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
         payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
@@ -405,7 +405,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
     * @Description 汇款凭证审核不通过 审核人 给申请人发送消息
     * @Date 2021/12/16 11:34
      * @param phone 企业端用户手机号
-     * @param projectId 负责人id
+     * @param projectId 项目id
      * @param projectName 项目名称
      * @param projectType 项目类型
     * @return void
@@ -460,11 +460,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
             case PayIncomeContractCommon.PROJECT_TYPE1:
                 PayCommonProject payCommonProject = payCommonProjectMapper.selectById(payPaymentRecord.getProjectId());
 
-                if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(payCommonProject.getPaymentStatus())){
-                    throw new JeroBootException("只有待审核的才可以审核");
-                }
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
+                    if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(payCommonProject.getPaymentStatus())){
+                        throw new JeroBootException("普通项目只有缴费凭证状态为“待审核”才可以同意");
+                    }
                     List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
                     payPaymentRecords.add(payPaymentRecord);
                     payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2);
@@ -474,9 +474,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     //更新主列表
                     payCommonProjectMapper.updateById(payCommonProject);
                     //发消息
-                    principalId = payCommonProject.getPrincipalId();
                     project = payCommonProject.getChargeProject();
-                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
+                    checkSendMessage(payPaymentRecord.getCreateBy(), payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
                 }
 
                 break;
@@ -485,12 +484,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
                 PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
 
-                if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(payWorking.getPaymentStatus())){
-                    throw new JeroBootException("只有待审核的才可以审核");
-                }
-
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
+                    if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(payWorking.getPaymentStatus())){
+                        throw new JeroBootException("工作组项目只有缴费凭证状态为“待审核”才可以同意");
+                    }
                     List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
                     payPaymentRecords.add(payPaymentRecord);
                     payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2);
@@ -500,9 +498,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     //更新主列表
                     payWorkingGroupSubItemMapper.updateById(payWorking);
                     //发消息
-                    principalId = payWorkingGroup.getPrincipalIdA();
                     project = payWorkingGroup.getWorkingGroupProject();
-                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
+                    checkSendMessage(payPaymentRecord.getCreateBy(), payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
                 }
 
                 break;
@@ -511,12 +508,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 PayMemberProjectSubitem member = payMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
                 PayMemberProject payMemberProject = memberProjectService.getById(member.getProjectId());
 
-                if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(member.getPaymentStatus())){
-                    throw new JeroBootException("只有待审核的才可以审核");
-                }
-
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
+                    if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(member.getPaymentStatus())){
+                        throw new JeroBootException("会员项目只有缴费凭证状态为“待审核”才可以同意");
+                    }
                     List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
                     payPaymentRecords.add(payPaymentRecord);
                     payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2);
@@ -526,9 +522,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     //更新主列表
                     payMemberProjectSubitemMapper.updateById(member);
                     //发消息
-                    principalId = payMemberProject.getDirectorId();
                     project = payMemberProject.getProjectName();
-                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
+                    checkSendMessage(payPaymentRecord.getCreateBy(),payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
                 }
 
                 break;
@@ -538,7 +533,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbMember.getProjectId());
 
                 if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(tbMember.getPaymentStatus())){
-                    throw new JeroBootException("只有待审核的才可以审核");
+                    throw new JeroBootException("标协会员只有只有缴费凭证状态为“待审核”才可以审核");
                 }
 
                 //发消息参数
@@ -576,7 +571,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     tbMember.setPaymentStatus(paymentStatus);
                     tbCheckVo.setCheckResult(PayProjectCommon.NO);
 
-                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
+                    checkSendMessage(payPaymentRecord.getCreateBy(), payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
                 }
 
                 //更新主列表
@@ -596,7 +591,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                 TbMemberProject tbMemberProjectCertificate = tbMemberProjectService.getById(tbMemberCertificate.getProjectId());
 
                 if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(tbMemberCertificate.getPaymentStatus())){
-                    throw new JeroBootException("只有待审核的才可以审核");
+                    throw new JeroBootException("标协证书只有只有缴费凭证状态为“待审核”才可以审核");
                 }
                 //发消息参数
                 principalId = tbMemberProjectCertificate.getDirectorId();
@@ -634,7 +629,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     tbMemberCertificate.setPaymentStatus(paymentStatus);
                     tbCheckCerVo.setCheckResult(PayProjectCommon.NO);
 
-                    checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
+                    checkSendMessage(payPaymentRecord.getCreateBy(), payPaymentRecord.getProjectId(),project, String.valueOf(payPaymentRecord.getProjectType()));
                 }
 
                 //更新主列表
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java
index ae5e5e5f..11dec669 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java
@@ -1,6 +1,7 @@
 package com.jero.standards.memberinfo.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.standards.memberinfo.entity.MemberInfo;
 
@@ -21,5 +22,5 @@ public interface IMemberInfoService extends IService<MemberInfo> {
      * @param contacts
      * @return
      */
-    Map<String,Object> baseInfo(PayContactsManagement contacts);
+    Map<String,Object> baseInfo(PayCompanyManagement company);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java
index ae53f42c..92529811 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
+import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.member.entity.PayMemberProject;
 import com.jero.standards.memberinfo.entity.MemberInfo;
@@ -45,11 +46,11 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoMapper, MemberI
      * @return
      */
     @Override
-    public Map<String,Object> baseInfo(PayContactsManagement contacts) {
+    public Map<String,Object> baseInfo(PayCompanyManagement company) {
 
         //右侧本企业信息
         LambdaQueryWrapper<MemberInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(MemberInfo::getId,contacts.getMemberId());
+        wrapper.eq(MemberInfo::getId,company.getMemberId());
         MemberInfo memberInfo = memberInfoMapper.selectOne(wrapper);
         //解密
         String memberMobile = PasswordUtil.decrypt(memberInfo.getMobile(), PasswordUtil.ALGORITHM, PasswordUtil.Salt);