From 80c98464e3ef8d9db657851131d4d43c2d5cba69 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 25 Mar 2024 14:37:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082886=20=E5=B7=A5=E4=BD=9C=E7=BB=84--?=
 =?UTF-8?q?=E4=B8=8D=E6=94=B6=E8=B4=B9--=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E6=9B=B4=E6=8D=A2=E4=BC=81=E4=B8=9A=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA1--=E5=AF=BC=E5=87=BA=E7=9A=84=E9=82=AE?=
 =?UTF-8?q?=E5=AF=84=E8=81=94=E7=B3=BB=E4=BA=BA=E6=B2=A1=E6=9C=89=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/project/common/PayProjectCommon.java   |  4 ++++
 .../impl/PayWorkingGroupSubItemServiceImpl.java     | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
index 95c6fac0..ce7ab5f8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
@@ -141,6 +141,10 @@ public class PayProjectCommon {
      * 	completed 已完结
      */
     public final static String PAYMENT_STATUS = "toBeUploaded";
+    /**
+     * 0 不付费
+     */
+    public static final Integer PAY_FLAG_0 = 0;
     /**
      * 确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index 449589bc..9b27e37e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -23,6 +23,7 @@ import com.jero.common.util.ValidUtil;
 import com.jero.common.vo.ProjectStatusVO;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
+import com.jero.company.mapper.PayContactsManagementMapper;
 import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
 import com.jero.contract.entity.PayIncomeContract;
@@ -133,6 +134,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
     PayWorkingGroupSubItemContactsMapper payWorkingGroupSubItemContactsMapper;
     @Resource
     IPayCommonProjectService payCommonProjectService;
+    @Resource
+    private PayContactsManagementMapper payContactsManagementMapper;
 
     private static final String DATE_FORMAT = "yyyy-MM-dd";
 
@@ -467,6 +470,16 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         if (Objects.equals(payWorkingGroupSubItem.getChargeWay(), PayProjectCommon.CHARGE_WAY3)) {
             updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum, null);
         }
+        String contactsId = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList().get(0).getContactsId();
+        // 判断如果是不收费的工作组则更新子项目时同时更新邮寄联系人
+        if (Objects.equals(payWorkingGroup.getPayFlag(), PayProjectCommon.PAY_FLAG_0) &&
+                Objects.nonNull(contactsId)) {
+            // 如果有邮寄信息更新邮寄联系人信息
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getMailContactsId, contactsId);
+            // 根据contactsId获取用户名
+            PayContactsManagement contact= payContactsManagementMapper.selectById(contactsId);
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getMailContactsTemporaryName, contact.getName());
+        }
         payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
         //    如果有邮寄信息更新邮寄联系人信息
         String mailContactsId = payWorkingGroupSubItem.getMailContactsId();