From 250bc80cd4b0183612a15c9735ec0dab965df8b0 Mon Sep 17 00:00:00 2001
From: guohb <ghb01699725@alibaba-inc.com>
Date: Thu, 16 May 2024 17:32:14 +0800
Subject: [PATCH] fix

---
 .../service/impl/FranchiseFeeServiceImpl.java      |  5 +++++
 .../store/service/impl/SysStoreAppServiceImpl.java | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
index d551efe07..f767c7d73 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
@@ -5,9 +5,11 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.ShopStageInfoDAO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.AuditTypeEnum;
+import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.enums.MessageEnum;
 import com.cool.store.enums.SMSMsgEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
+import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.*;
 import com.cool.store.request.AuditFranchiseFeeRequest;
 import com.cool.store.request.FranchiseFeeRequest;
@@ -70,6 +72,9 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
         FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO();
         franchiseFeeDO.setShopId(shopId);
         FranchiseFeeDO result = franchiseFeeMapper.selectOne(franchiseFeeDO);
+        if (Objects.isNull(result)){
+            return new FranchiseFeeResponse();
+        }
         FranchiseFeeResponse resp = FranchiseFeeResponse.from(result);
         LinePayDO linePayDO = linePayMapper.selectByPrimaryKey(result.getPayId());
         if (Objects.nonNull(linePayDO)) {
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
index 76da03453..5abf44d45 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
@@ -153,19 +153,19 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
         RegionDO bigRegion = regionMapper.getBigRegionByRegionId(regionId);//大区
         RegionDO fightRegion = regionMapper.getByRegionId(regionId);//战区
         EnterpriseUserDO regionManager = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId());
-        EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, fightRegion.getId());
+//        EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, fightRegion.getId());
         if (Objects.nonNull(regionManager)) {
             // regioGeneral
             supervisorDetail.setRegioGeneral(regionManager.getName());
             // regioGeneralId
             supervisorDetail.setRegioGeneralId(regionManager.getUserId());
         }
-        if (Objects.nonNull(supervisor)) {
-            // supervisorName
-            supervisorDetail.setSupervisorName(supervisor.getName());
-            // supervisorId
-            supervisorDetail.setSupervisorId(supervisor.getUserId());
-        }
+//        if (Objects.nonNull(supervisor)) {
+//            // supervisorName
+//            supervisorDetail.setSupervisorName(supervisor.getName());
+//            // supervisorId
+//            supervisorDetail.setSupervisorId(supervisor.getUserId());
+//        }
         storeDetail.setBigName(bigRegion.getName());
         storeDetail.setBigCode(bigRegion.getSynDingDeptId());
         storeDetail.setFightName(fightRegion.getName());