From d6c8aec473de1ada2a7350038e57b3edd3e938ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Wed, 14 May 2025 16:32:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=98=B6=E6=AE=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SignFranchiseServiceImpl.java        | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
index f871c50dd..243fdac54 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
@@ -382,29 +382,34 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             //判断是否是老店新开
             SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId);
             log.info("加盟合同审批时签约类型:{}",SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
+            Boolean sendNotice = Boolean.TRUE;
             if (SignTypeEnum.OLD_NEW_OPEN.getCode().equals(signFranchiseDO.getSignType())){
                 //老店新开时装修与开业直接完成
                 shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId),Arrays.asList(
                         SHOP_SUB_STAGE_STATUS_863,SHOP_SUB_STAGE_STATUS_91,SHOP_SUB_STAGE_STATUS_112,SHOP_SUB_STAGE_STATUS_123,SHOP_SUB_STAGE_STATUS_143
                 ));
+                //老店新开 不需要装修与开业 无需发送通知
+                sendNotice = Boolean.FALSE;
             }
             commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT);
-            HashMap<String, String> map = new HashMap<>();
-            map.put("partnerUsername", lineInfoDO.getUsername());
-            map.put("partnerMobile", lineInfoDO.getMobile());
-            map.put("storeName", shopInfoDO.getShopName());
-            List<EnterpriseUserDO> userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId());
-            List<String> finances = new ArrayList<>();
-            if (Objects.nonNull(userDOList)) {
-                finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+            if (sendNotice){
+                HashMap<String, String> map = new HashMap<>();
+                map.put("partnerUsername", lineInfoDO.getUsername());
+                map.put("partnerMobile", lineInfoDO.getMobile());
+                map.put("storeName", shopInfoDO.getShopName());
+                List<EnterpriseUserDO> userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId());
+                List<String> finances = new ArrayList<>();
+                if (Objects.nonNull(userDOList)) {
+                    finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+                }
+                List<String> liGuiNeiQinList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.CONSTRUCTION_CUSTOMER.getCode()));
+                commonService.sendQWMessage(liGuiNeiQinList,
+                        MessageEnum.MESSAGE_57,
+                        map);
+                commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()),
+                        MessageEnum.MESSAGE_26,
+                        map);
             }
-            List<String> liGuiNeiQinList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.CONSTRUCTION_CUSTOMER.getCode()));
-            commonService.sendQWMessage(liGuiNeiQinList,
-                    MessageEnum.MESSAGE_57,
-                    map);
-            commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()),
-                    MessageEnum.MESSAGE_26,
-                    map);
         }
         shopAuditInfoMapper.insertSelective(shopAuditInfoDO);
         Long auditId = shopAuditInfoDO.getId();