From 0f96c63553b7a1a6eb6fbbcef8be1e556e1b3fe4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 31 Jul 2023 10:51:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=2074230=20=E5=B7=B2=E7=BB=8F=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=E7=9A=84=E6=89=93=E5=8C=85=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE=E4=B8=8D=E5=85=81=E8=AE=B8=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayPackCompanyProjectServiceImpl.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 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 9593d1f3..7b76bab5 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
@@ -179,8 +179,14 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
             PayCommonProject payCommonProject = projectDetailMapper.queryProject(projectId);
             Integer chargeWay = payCommonProject.getChargeWay();
             Integer affirmIncome = payCommonProject.getAffirmIncome();
-            if(Objects.equals(chargeWay,PayProjectCommon.CHARGE_WAY2) && (1 == affirmIncome || 2 == affirmIncome)){
-                throw new JeroBootException("已经确认收入的打包标协会员项目不允许取消打包");
+            Integer inAccount = payCommonProject.getInAccount();
+            if(Objects.equals(chargeWay,PayProjectCommon.CHARGE_WAY2)){
+                if (1 == affirmIncome || 2 == affirmIncome){
+                    throw new JeroBootException("已经确认收入的打包标协会员项目不允许取消打包");
+                }
+                if (1 == inAccount || 2 == inAccount){
+                    throw new JeroBootException("已经来款的打包标协会员项目不允许取消打包");
+                }
             }
         }
         if(Objects.equals(packCompanyProject.getCome(),PackCommon.COME1)){