From 90f27445dcfbde3f461d67b057ca423e19a37a16 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, 18 Sep 2021 17:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayIncomeContractServiceImpl.java    | 45 +++++++++++--------
 ...CompanyManagementTemporaryServiceImpl.java |  1 +
 ...ontactsManagementTemporaryServiceImpl.java |  1 +
 3 files changed, 28 insertions(+), 19 deletions(-)

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 5b14babb..cb6b34fd 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
@@ -50,10 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -148,7 +145,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             log.info("收入合同-添加异常",e);
             throw new JeroBootException("合同名称已存在！");
         }
-        setPayIncomeContract(payIncomeContract);
+        setPayIncomeContract(payIncomeContract,null);
         payIncomeContract.setStatus(PayIncomeContractCommon.STATUS1);
         payIncomeContractService.save(payIncomeContract);
 
@@ -275,7 +272,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         // 校验金额
         checkPayIncomeContractInstallment(listPayIncomeContractInstallment,payIncomeContract);
-        setPayIncomeContract(payIncomeContract);
+        setPayIncomeContract(payIncomeContract,payIncomeContractStatus);
+        // 先删除临时表企业信息，联系人信息，邮寄联系人信息
+        payCompanyManagementTemporaryService.removeById(payIncomeContract.getSignedCompanyTemporaryId());
+        payContactsManagementTemporaryService.removeByIds(Arrays.asList(payIncomeContract.getSignedContactsTemporaryId()));
         payIncomeContractService.updateById(payIncomeContract);
     }
 
@@ -661,17 +661,28 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
      * @Return
      * @Exception
      */
-    private void setPayIncomeContract(PayIncomeContract payIncomeContract){
-        // 企业
-        PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId());
-        if(Objects.isNull(chargeCompanyName)){
-            throw new JeroBootException("企业名称为空！");
+    private void setPayIncomeContract(PayIncomeContract payIncomeContract,PayIncomeContract payIncomeContractStatus){
+        if(Objects.isNull(payIncomeContractStatus) || !Objects.equals(payIncomeContractStatus.getSignedCompanyTemporaryId(),payIncomeContract.getSignedCompanyId())){
+            // 企业
+            PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId());
+            if(Objects.isNull(chargeCompanyName)){
+                throw new JeroBootException("企业名称为空！");
+            }
+            payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
+            payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
         }
-        // 联系人
-        PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payIncomeContract.getSignedContactsId());
-        if(Objects.isNull(contactsName)){
-            throw new JeroBootException("联系人名称为空！");
+
+        if(Objects.isNull(payIncomeContractStatus) || !Objects.equals(payIncomeContractStatus.getSignedContactsTemporaryId(),payIncomeContract.getSignedContactsId())){
+            // 联系人
+            PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payIncomeContract.getSignedContactsId());
+            if(Objects.isNull(contactsName)){
+                throw new JeroBootException("联系人名称为空！");
+            }
+            payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
+            payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
         }
+
+
         // 负责人名称
         SysUser principalName = sysUserService.getById(payIncomeContract.getPrincipalId());
         if(Objects.isNull(principalName)){
@@ -679,10 +690,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         }
         payIncomeContract.setPrincipalId(principalName.getId());
         payIncomeContract.setPrincipalName(principalName.getRealname());
-        payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
-        payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
-        payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
-        payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
     }
 
     @Override
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java
index 83d53533..f970249e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java
@@ -48,6 +48,7 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl<PayCom
             str = JSONObject.toJSONString(payCompanyManagement);
         }
         PayCompanyManagementTemporary payCompanyManagementTemporary = JSON.parseObject(str,PayCompanyManagementTemporary.class);
+        payCompanyManagementTemporary.setId(null);
         payCompanyManagementTemporaryService.save(payCompanyManagementTemporary);
         return payCompanyManagementTemporary;
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java
index 2c914519..1525a1a7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java
@@ -47,6 +47,7 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl<PayCo
             str = JSONObject.toJSONString(payContactsManagement);
         }
         PayContactsManagementTemporary payContactsManagementTemporary = JSON.parseObject(str,PayContactsManagementTemporary.class);
+        payContactsManagementTemporary.setId(null);
         payContactsManagementTemporaryService.save(payContactsManagementTemporary);
         return payContactsManagementTemporary;
     }