From 90a94c03b8b495bba072f37d47823d79f7496ee6 Mon Sep 17 00:00:00 2001
From: guohb <ghb01699725@alibaba-inc.com>
Date: Tue, 21 May 2024 11:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=8C=BA=E7=BB=8F=E7=90=86=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=80=9A=E7=9F=A5=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ApplyLicenseServiceImpl.java | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
index 444d22c62..b2f8efe14 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
@@ -8,7 +8,6 @@ import com.cool.store.dao.RegionDao;
 import com.cool.store.dao.ShopStageInfoDAO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
-import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.mapper.*;
 import com.cool.store.request.LicenseListRequest;
@@ -19,7 +18,6 @@ import com.cool.store.response.SubmitLicenseResponse;
 import com.cool.store.service.ApplyLicenseService;
 import com.cool.store.service.CoolStoreStartFlowService;
 import com.cool.store.service.PreparationService;
-import com.cool.store.service.RegionService;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.utils.poi.StringUtils;
 import com.cool.store.utils.poi.constant.Constants;
@@ -49,9 +47,6 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
     @Resource
     private EnterpriseUserDAO userDAO;
 
-    @Resource
-    private RegionService regionService;
-
     @Resource
     private RegionDao regionDao;
 
@@ -76,9 +71,6 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
     @Resource
     EnterpriseUserRoleMapper enterpriseUserRoleMapper;
 
-    @Resource
-    UserRegionMappingMapper userRegionMappingMapper;
-
     @Resource
     UserAuthMappingMapper userAuthMappingMapper;
 
@@ -119,8 +111,24 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
             requestMap.put("storeName", shopInfoDO.getShopName());
             requestMap.put("partnerName,", lineInfoDO.getUsername());
             requestMap.put("partnerMobile", lineInfoDO.getMobile());
-            log.info("submitLicense SMS requestMap:{}",JSONObject.toJSONString(requestMap));
-            commonService.sendMessage(Collections.singletonList(shopInfoDO.getSupervisorUserId()), MessageEnum.MESSAGE_17, requestMap);
+            log.info("submitLicense SMS requestMap:{}", JSONObject.toJSONString(requestMap));
+            List<String> sendUsers = new ArrayList<>();
+            //如果没有督导，则发送给管辖此区域的所有战区经理
+            if (StringUtil.isBlank(shopInfoDO.getSupervisorUserId())) {
+                Long regionId = shopInfoDO.getRegionId();
+                List<UserAuthMappingDO> userAuthByMappingIds = userAuthMappingMapper.getUserAuthByMappingIds(Collections.singletonList(String.valueOf(regionId)));
+                if (CollectionUtils.isNotEmpty(userAuthByMappingIds)) {
+                    List<String> sendUserIds = userAuthByMappingIds.stream().map(UserAuthMappingDO::getUserId).collect(Collectors.toList());
+                    sendUsers.addAll(sendUserIds);
+                }
+            } else {
+                sendUsers.add(shopInfoDO.getSupervisorUserId());
+            }
+            if (CollectionUtils.isEmpty(sendUsers)) {
+                log.info("未找到可发送工作通知的人员");
+                return true;
+            }
+            commonService.sendMessage(sendUsers, MessageEnum.MESSAGE_17, requestMap);
         }
         return true;
     }
@@ -175,7 +183,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
     public SubmitLicenseResponse.StoreDocument toStoreDocument(GetStoreInfoByCodeResponse.StoreDocument storeDocument) {
         SubmitLicenseResponse.StoreDocument submitLicenseResponse = new SubmitLicenseResponse.StoreDocument();
         boolean storeBusinessValidPeriod = storeDocument.getStoreBusinessValidPeriod().equals("9");
-        submitLicenseResponse.setLicenseType(LicenseTypeEnum.matchName(storeDocument.getStoreBusinessType()).getCode());
+        submitLicenseResponse.setLicenseType(Objects.requireNonNull(LicenseTypeEnum.matchName(storeDocument.getStoreBusinessType())).getCode());
         submitLicenseResponse.setLicenseLegalPerson(storeDocument.getStoreDirector());
         submitLicenseResponse.setIssueTime(DateUtil.parseDate(storeDocument.getStoreBusinessDate()));
         submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd());