From b3c7992913702278fd15102bd3eda24ff40e9bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 13 Sep 2021 15:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayPackCompanyProjectServiceImpl.java     | 24 +++++++------------
 .../impl/PayCommonProjectServiceImpl.java     |  1 +
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
index f75434e0..6f45778c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
@@ -101,16 +101,18 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
     @Override
     @Transactional
     public void removePayPackCompanyProject(PayPackCompanyProject payPackCompanyProject) {
-        PayPackCompanyProject payPackCompanyProjectNew = payPackCompanyProjectService.getById(payPackCompanyProject.getId());
-        if(Objects.isNull(payPackCompanyProjectNew)){
+        LambdaQueryWrapper<PayPackCompanyProject> query = new LambdaQueryWrapper<>();
+        query.eq(PayPackCompanyProject::getProjectId,payPackCompanyProject.getId());
+        List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(query);
+        if(CollectionUtils.isEmpty(listPayPackCompanyProject)){
             throw new JeroBootException("不存在打包项目！");
         }
-        if(Objects.equals(payPackCompanyProjectNew.getCome(),PackCommon.COME1)){
+        if(Objects.equals(listPayPackCompanyProject.get(0).getCome(),PackCommon.COME1)){
             throw new JeroBootException("此项目已在合同处创建关联，请先从合同处取消关联！");
         }
         // 更新项目状态
-        projectPackService.updateProjectStatus(payPackCompanyProjectNew.getProjectId(),String.valueOf(payPackCompanyProjectNew.getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
-        payPackCompanyProjectService.removeById(payPackCompanyProject.getId());
+        projectPackService.updateProjectStatus(listPayPackCompanyProject.get(0).getProjectId(),String.valueOf(listPayPackCompanyProject.get(0).getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
+        payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId());
     }
 
     @Override
@@ -121,17 +123,9 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
             if(StringUtils.isBlank(s1)){
                 throw new JeroBootException("id不能为空!");
             }
-            PayPackCompanyProject payPackCompanyProjectNew = payPackCompanyProjectService.getById(s1);
-            if(Objects.isNull(payPackCompanyProjectNew)){
-                throw new JeroBootException("不存在打包项目！");
-            }
-            if(Objects.equals(payPackCompanyProjectNew.getCome(),PackCommon.COME1)){
-                throw new JeroBootException("此项目已在合同处创建关联，请先从合同处取消关联！");
-            }
-            // 更新项目状态
-            projectPackService.updateProjectStatus(payPackCompanyProjectNew.getProjectId(),String.valueOf(payPackCompanyProjectNew.getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
+            payPackCompanyProject.setId(s1);
+            removePayPackCompanyProject(payPackCompanyProject);
         }
-        payPackCompanyProjectService.removeByIds(Arrays.asList(payPackCompanyProject.getPackProjectIds()));
     }
 
     @Override
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index ff0a8fa9..86dee4c4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -96,6 +96,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
         if(Objects.equals(payCommonProject.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
             payIncomeContract = payIncomeContractService.setPayIncomeContractAssociated(payCommonProject.getContractNum(),payCommonProject.getChargeCompanyId(),payCommonProject.getId());
         }
+
         // 关联了合同,判断合同是否打包，更新项目打包状态，添加打包
         if(!Objects.isNull(payIncomeContract) && Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){
             LambdaUpdateWrapper<PayCommonProject> update = new LambdaUpdateWrapper<>();