From 1a72e3f37606301a5f7d6452779c0b6c3cf7491d Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Tue, 22 Feb 2022 10:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=AD=98=E6=A1=A3=E7=9A=84=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E6=89=8D=E5=8F=AF=E5=9C=A8=E9=82=AE=E5=AF=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=94=B9=E6=88=90=E4=B8=8D?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E7=8A=B6=E6=80=81=E4=BA=86=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E8=A6=81=E5=BD=95=E5=85=A5=E4=BA=86=E5=90=88=E5=90=8C=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=B0=B1=E5=8F=AF=E4=BB=A5=E9=82=AE=E5=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayIncomeContractServiceImpl.java    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 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 18cc16d1..08c595a9 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
@@ -178,6 +178,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         payIncomeContract.setStatus(PayIncomeContractCommon.STATUS1);
         payIncomeContractService.save(payIncomeContract);
 
+        // 更新到合同邮寄表
+        PayMailContract payMailContract = new PayMailContract();
+        PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContract.getSignedContactsTemporaryId());
+        if(!Objects.isNull(payContactsManagementTemporary)){
+            payMailContract.setMobile(payContactsManagementTemporary.getPhone());
+            payMailContract.setEmail(payContactsManagementTemporary.getEmail());
+        }
+        payMailContract.setContractId(payIncomeContract.getId());
+        payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
+        payMailContract.setLiaisonMan(payIncomeContract.getContractName());
+        payMailContractService.save(payMailContract);
+
         // 校验金额
         checkPayIncomeContractInstallment(listPayIncomeContractInstallment,payIncomeContract);
         // 新建项目 给企业联系人发送消息
@@ -790,17 +802,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         LambdaUpdateWrapper<PayMailContract> updatePayMailContract = new LambdaUpdateWrapper<>();
         updatePayMailContract.eq(PayMailContract::getContractId,payIncomeContract.getId());
         payMailContractService.remove(updatePayMailContract);
-        // 更新到合同邮寄表
-        PayMailContract payMailContract = new PayMailContract();
-        PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContractNew.getSignedContactsTemporaryId());
-        if(!Objects.isNull(payContactsManagementTemporary)){
-            payMailContract.setMobile(payContactsManagementTemporary.getPhone());
-            payMailContract.setEmail(payContactsManagementTemporary.getEmail());
-        }
-        payMailContract.setContractId(payIncomeContractNew.getId());
-        payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
-        payMailContract.setLiaisonMan(payIncomeContractNew.getContractName());
-        payMailContractService.save(payMailContract);
 
         // 获取财务人员，发送消息
         List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));