From 055b587e58ccebf9730316dc91eb80939748a0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Sat, 9 Oct 2021 10:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8Cbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9#40228?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/PayIncomeContractCommon.java       |  7 +-
 .../mapper/xml/PayIncomeContractMapper.xml    |  2 +-
 .../impl/PayIncomeContractServiceImpl.java    | 88 +++++++++----------
 3 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
index c714c1b6..335c2eb7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
@@ -108,10 +108,15 @@ public class PayIncomeContractCommon {
      * @param RSAPublicKey 公钥
      * @return String 加密后的字符串
      */
-    public static String encryptByRsaPriKey(String token,String RSAPublicKey) {
+    public final static String encryptByRsaPriKey(String token,String RSAPublicKey) {
         RSA rsa = new RSA(null, RSAPublicKey);
         byte[] encrypt = rsa.encrypt(token, KeyType.PublicKey);
         return new String(encrypt);
     }
 
+    /**
+     * 来款方式（1：无，2：合同，3：收费通知）
+     */
+    public final static Integer CHARGE_WAY2 = 2;
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
index 67e7b2a8..6baaa33a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
@@ -184,7 +184,7 @@
             LEFT JOIN tb_member_project tmember ON tmember.id=tmsub.project_id
             WHERE pica.contract_id = #{contractId}
         ) a
-        ORDER BY createTime,projectId DESC
+        ORDER BY createTime DESC,projectId DESC
     </select>
     <select id="queryCompanyPageList" resultType="com.jero.contract.entity.PayIncomeContract">
         select pic.*,pmc.post_status as postStatus from pay_income_contract pic
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index c031c6fb..7fc842f4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -336,23 +336,21 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     }
                     // 验证项目是否已被关联
                     getIncomeContractAssociated(p.getContractId(),p.getProjectId());
-
-                    // 合同选择打包 && 企业没有打包，添加打包企业
-                    if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) && !Objects.equals(payCommonProject.getPack(),PayIncomeContractCommon.PACK1)){
-                        LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
-                        updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId());
-                        if(!StringUtils.isBlank(payCommonProject.getContractNum())){
-                            updatePayCommonProject.set(PayCommonProject::getContractNum,payIncomeContract.getContractNum());
-                        }
+                    // 关联合同，项目选了合同，变更合同编号
+                    LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
+                    updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId());
+                    updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername());
+                    updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date());
+                    if(Objects.equals(payCommonProject.getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
+                        updatePayCommonProject.set(PayCommonProject::getContractNum,payIncomeContract.getContractNum());
+                    }
+                    // 合同选择了打包，查看打包年份&&打包企业是否存在
+                    if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
                         updatePayCommonProject.set(PayCommonProject::getPack,PayIncomeContractCommon.PACK1);
-                        updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername());
-                        updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date());
+                        payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
+                    }
+                    if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(payCommonProject.getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
                         payCommonProjectService.update(updatePayCommonProject);
-                        // 添加打包企业
-                        // 合同选择了打包，查看打包年份&&打包企业是否存在
-                        if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
-                            payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
-                        }
                     }
                     principalId = payCommonProject.getPrincipalId();
                     projectName = payCommonProject.getChargeProject();
@@ -379,23 +377,21 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
 
                     // 验证项目是否已被关联
                     getIncomeContractAssociated(p.getContractId(),listPayWorkingGroupSubItem.get(0).getId());
-                    // 合同选择打包,运行年份不是打包企业，添加打包企业
+                    // 关联合同，项目选了合同，变更合同编号
+                    LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
+                    updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
+                    updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
+                    updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId());
+                    if(Objects.equals(listPayWorkingGroupSubItem.get(0).getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
+                        updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,payIncomeContract.getContractNum());
+                    }
+                    // 合同选择了打包，查看打包年份&&打包企业是否存在
                     if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
-                        // 打包,将关联项目设置成打包
-                        LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
-                        updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
-                        updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
-                        if(!StringUtils.isBlank(listPayWorkingGroupSubItem.get(0).getContractNum())){
-                            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,payIncomeContract.getContractNum());
-                        }
                         updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK1);
-                        updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId());
+                        payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
+                    }
+                    if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(listPayWorkingGroupSubItem.get(0).getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
                         payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
-                        // 添加打包企业
-                        // 合同选择了打包，查看打包年份&&打包企业是否存在
-                        if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
-                            payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
-                        }
                     }
                     principalId = payWorkingGroup.getPrincipalIdA();
                     projectName = payWorkingGroup.getWorkingGroupProject();
@@ -423,12 +419,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     }
                     // 验证项目是否已被关联
                     getIncomeContractAssociated(p.getContractId(),payMeetingSituation.getId());
-                    // 合同选择打包,运行年份不是打包企业，添加打包企业
+                    // 合同选择了打包，查看打包年份&&打包企业是否存在
                     if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
-                        // 合同选择了打包，查看打包年份&&打包企业是否存在
-                        if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
-                            payPackCompanyProjectService.setPack(payMeetingSituation.getCompanyId(),payMeetingSituation.getContractId(),payIncomeContract.getPackYear(),payMeetingSituation.getId(),PayIncomeContractCommon.PROJECT_TYPE3,payIncomeContract.getPack());
-                        }
+                        payPackCompanyProjectService.setPack(payMeetingSituation.getCompanyId(),payMeetingSituation.getContractId(),payIncomeContract.getPackYear(),payMeetingSituation.getId(),PayIncomeContractCommon.PROJECT_TYPE3,payIncomeContract.getPack());
                     }
                     principalId = payMeeting.getDirectorId();
                     projectName = payMeeting.getMeetingName();
@@ -454,23 +447,22 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     }
                     // 验证项目是否已被关联
                     getIncomeContractAssociated(p.getContractId(),listPayMemberProjectSubitem.get(0).getId());
-                    // 合同选择打包,运行年份不是打包企业，添加打包企业
+
+                    // 关联合同，项目选了合同，变更合同编号,选择了打包，变更打包状态
+                    LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
+                    updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateBy,sysUser.getUsername());
+                    updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateTime,new Date());
+                    updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,listPayMemberProjectSubitem.get(0).getId());
+                    if(Objects.equals(listPayMemberProjectSubitem.get(0).getPaymentMethod(),PayIncomeContractCommon.CHARGE_WAY2)){
+                        updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,payIncomeContract.getContractNum());
+                    }
+                    // 合同选择了打包，查看打包年份&&打包企业是否存在
                     if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
-                        // 打包,将关联项目设置成打包
-                        LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
-                        updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateBy,sysUser.getUsername());
-                        updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateTime,new Date());
-                        if(!StringUtils.isBlank(listPayMemberProjectSubitem.get(0).getContractNo())){
-                            updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,payIncomeContract.getContractNum());
-                        }
                         updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getPack,PayIncomeContractCommon.PACK1);
-                        updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,listPayMemberProjectSubitem.get(0).getId());
+                        payPackCompanyProjectService.setPack(listPayMemberProjectSubitem.get(0).getCompanyId(),listPayMemberProjectSubitem.get(0).getCompanyContactId(),payIncomeContract.getPackYear(),listPayMemberProjectSubitem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE4,payIncomeContract.getPack());
+                    }
+                    if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(listPayMemberProjectSubitem.get(0).getPaymentMethod(),PayIncomeContractCommon.CHARGE_WAY2)){
                         memberProjectSubitemService.update(updatePayMemberProjectSubitem);
-                        // 添加打包企业
-                        // 合同选择了打包，查看打包年份&&打包企业是否存在
-                        if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
-                            payPackCompanyProjectService.setPack(listPayMemberProjectSubitem.get(0).getCompanyId(),listPayMemberProjectSubitem.get(0).getCompanyContactId(),payIncomeContract.getPackYear(),listPayMemberProjectSubitem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE4,payIncomeContract.getPack());
-                        }
                     }
                     principalId = payMemberProject.getDirectorId();
                     projectName = payMemberProject.getProjectName();