From bd8d91fdb8b97e70e9e963cd40f12758b2cbadff Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 14 Jul 2025 17:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dao/RegionDao.java | 3 +++ .../com/cool/store/service/impl/DataHandlerServerImpl.java | 4 ++-- .../java/com/cool/store/service/impl/ShopServiceImpl.java | 4 ++-- .../cool/store/service/impl/SignFranchiseServiceImpl.java | 6 ++++-- .../cool/store/controller/webb/DataHandlerController.java | 7 +++++++ 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java index 1deeeb750..e22c19967 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java @@ -32,6 +32,9 @@ public class RegionDao { public RegionNode getRegionByRegionId( String regionId) { + if (StringUtils.isBlank(regionId)) { + return null; + } return regionMapper.getRegionByRegionId( regionId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java index a8ff9d00f..85cea3df3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java @@ -1165,9 +1165,9 @@ public class DataHandlerServerImpl implements DataHandlerServer { shopInfoDO.setManagerRegionId(isCreateStoreDTO.getPid()); updateList.add(shopInfoDO); } - List bigRegionDTOS = bigRegionDAO.queryBigRegion(new QueryBigRegionRequest()); + List bigRegionDTOS = bigRegionDAO.queryAllBigRegion(null); Map bigRegionDTOMap = bigRegionDTOS.stream().collect(Collectors.toMap(BigRegionDTO::getRegionId, x -> x)); - //XX大区 + //XX大区 正烧鸡 List storeManageIds = bigRegionDTOS.stream().filter(x -> x.getStoreManageRegionId() != null).map(BigRegionDTO::getStoreManageRegionId).collect(Collectors.toList()); //加盟分部 List branchStoreManageIds = bigRegionDTOS.stream().filter(x -> x.getStoreManageRegionId() == null).map(BigRegionDTO::getRegionId).collect(Collectors.toList()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index bf0010c1c..66e563da1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -391,8 +391,8 @@ public class ShopServiceImpl implements ShopService { } EnterpriseUserDO invest = enterpriseUserDAO.getUserInfoById(shopInfo.getInvestmentManager()); List shopContractActualCompletionTime = shopStageInfoDAO.getScheduleList(Collections.singletonList(shopId)); - RegionNode shopRegion = regionMapper.getRegionByRegionId(shopInfo.getRegionId().toString()); - RegionNode mapperRegionByRegionId = regionMapper.getRegionByRegionId(shopInfo.getManagerRegionId().toString()); + RegionNode shopRegion = regionDao.getRegionByRegionId(shopInfo.getRegionId().toString()); + RegionNode mapperRegionByRegionId = regionDao.getRegionByRegionId(shopInfo.getManagerRegionId().toString()); String wantShopArea = hyOpenAreaInfoDAO.selectNameMapById(shopInfo.getWantShopAreaId()); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(shopInfo.getWantShopAreaId()); BranchShopDetailResponse response = new BranchShopDetailResponse(); 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 732772f9b..3ed654a34 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 @@ -44,6 +44,8 @@ import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; @Slf4j public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResultService { + @Resource + private RegionDao regionDao; @Resource private PointInfoDAO pointInfoDAO; @Resource @@ -461,9 +463,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //证照办理 LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId); - RegionDO regionInfo = regionMapper.getByRegionId(shopInfoDO.getRegionId()); + RegionDO regionInfo = regionDao.selectById(shopInfoDO.getRegionId()); - RegionDO managerRegion = regionMapper.getByRegionId(shopInfoDO.getManagerRegionId()); + RegionDO managerRegion = regionDao.selectById(shopInfoDO.getManagerRegionId()); // if (Objects.nonNull(pointInfoDO)) { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java index f585dc74b..f56e8bc95 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java @@ -177,4 +177,11 @@ public class DataHandlerController { public ResponseResult franchiseFeeDateHandler(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum){ return ResponseResult.success(dataHandlerServer.franchiseFeeDateHandler(pageSize,pageNum)); } + + @ApiOperation("门店数据初始化") + @GetMapping("/dataHandlerCreateStore") + public ResponseResult dataHandlerCreateStore(){ + dataHandlerServer.dataHandlerCreateStore(); + return ResponseResult.success(true); + } }