From 7bbac6ff2c2979651053adc41b8f2d6643d6f8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 26 Apr 2022 14:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8F=98=E6=9B=B4=EF=BC=8C=E9=99=A4=E4=BA=86?=
 =?UTF-8?q?=E6=94=B6=E8=B4=B9=E6=96=B9=E5=BC=8F=E4=B8=BA=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E4=B8=8D=E8=BF=9B=E8=A1=8C=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BD=99=E7=8A=B6=E6=80=81=E9=83=BD=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemController.java     |  3 +--
 .../PayWorkingGroupSubItemServiceImpl.java    | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 611be45d..5a76c588 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -48,7 +48,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
@@ -427,7 +426,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 }
 
 	 /**
-	  * 查询工作组成员是否收费通知
+	  * 查询工作组成员是否收费通知(已弃用)
 	  *
 	  * @param ids            工作组成员ids 逗号分隔
 	  * @param workingGroupId 工作组id
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 caa0a3cc..fcc79bd2 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
@@ -805,15 +805,19 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             if(CollectionUtils.isEmpty(listPayContactsManagementTemporary)){
                 throw new JeroBootException("联系人不存在!");
             }
+            // 获取工作组信息
+            PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(list.get(0).getWorkingGroupId());
+            if(Objects.isNull(payWorkingGroup)){
+                throw new JeroBootException("工作组不存在!");
+            }
+            SysUser sysUserInfo = sysUserService.getById(payWorkingGroup.getPrincipalIdA());
+            if(Objects.isNull(sysUserInfo)){
+                throw new JeroBootException("负责人不存在!");
+            }
             list.forEach(p->{
-                // 获取工作组信息
-                PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(list.get(0).getWorkingGroupId());
-                if(Objects.isNull(payWorkingGroup)){
-                    throw new JeroBootException("工作组不存在!");
-                }
-                SysUser sysUserInfo = sysUserService.getById(payWorkingGroup.getPrincipalIdA());
-                if(Objects.isNull(sysUserInfo)){
-                    throw new JeroBootException("负责人不存在!");
+                // 收费通知为合同的，不进行变更，其他方式直接变更
+                if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
+                    return;
                 }
                 LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
                 // 变更应收金额，重新校验状态
@@ -832,6 +836,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 String paymentStatus = payPaymentCheckService.getPaymentStatus(input.getReceivableAmount(),p.getPaidAmount(),p.getPaymentStatus());
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPaymentStatus,paymentStatus);
                 updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,p.getId());
+                updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeWay,PayProjectCommon.CHARGE_WAY3);
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,input.getCharge());
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getReceivableAmount,input.getReceivableAmount());
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,input.getChargeNoticeNo());