From 3d003afc9c723002e140d8ea4e1fe5c381ec43a4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Jul 2025 13:20:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=AE=A1=E7=90=86=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/RegionDao.java | 8 ++++++++ .../com/cool/store/mapper/RegionMapper.java | 3 +++ .../src/main/resources/mapper/RegionMapper.xml | 8 ++++++++ .../main/resources/mapper/ShopInfoMapper.xml | 5 +++-- .../store/dto/Preparation/PreparationDTO.java | 2 ++ .../java/com/cool/store/entity/ShopInfoDO.java | 5 +++-- .../store/request/AddBranchShopRequest.java | 5 +++++ .../store/request/AddSignFranchiseRequest.java | 5 +++++ .../store/request/BranchShopDetailRequest.java | 2 ++ .../response/AddSignFranchiseResponse.java | 5 +++++ .../response/BranchShopDetailResponse.java | 7 +++++++ .../store/response/BranchShopResponse.java | 6 ++++++ .../cool/store/response/RegionResponse.java | 18 ++++++++++++++++++ .../com/cool/store/vo/shop/MiniShopPageVO.java | 9 +++++++++ .../cool/store/service/DataHandlerServer.java | 6 ++++++ .../com/cool/store/service/RegionService.java | 8 ++++++++ .../store/service/impl/RegionServiceImpl.java | 10 ++++++++++ .../store/service/impl/ShopServiceImpl.java | 12 +++++++++++- .../service/impl/SignFranchiseServiceImpl.java | 8 ++++++++ .../controller/webb/RegionController.java | 8 ++++++++ 20 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/response/RegionResponse.java 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 b62e08a56..b39e62a5e 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 @@ -1,8 +1,10 @@ package com.cool.store.dao; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.cool.store.dto.RegionNode; import com.cool.store.entity.RegionDO; import com.cool.store.mapper.RegionMapper; +import com.cool.store.response.RegionResponse; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; @@ -187,4 +189,10 @@ public class RegionDao { } return regionMapper.getRegionByStoreId(storeId); } + public List getSubRegionByParentIdAndRegionType (Long regionId, String regionType){ + if (Objects.isNull(regionId)|| StringUtils.isBlank(regionType)){ + return Lists.newArrayList(); + } + return regionMapper.getSubRegionByParentIdAndRegionType(regionId, regionType); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java index 5c5d4c334..1309ba981 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java @@ -2,6 +2,7 @@ package com.cool.store.mapper; import com.cool.store.dto.RegionNode; import com.cool.store.entity.RegionDO; +import com.cool.store.response.RegionResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -110,4 +111,6 @@ public interface RegionMapper { List getFightRegionByRegionIds(@Param("regionIds") List regionIds); RegionDO getRegionInfoBySynDingDeptId(@Param("synDingDeptId") Long synDingDeptId); + + List getSubRegionByParentIdAndRegionType( @Param("regionId")Long regionId, @Param("regionType")String regionType); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml index 5fe8bbfee..ce81f0b84 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml @@ -420,6 +420,14 @@ + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index c2697af53..519a7c531 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ shop_code, store_num, shop_manager_user_id, supervisor_user_id, plan_open_time, cur_progress, shop_type, shop_stage, deleted, create_time, update_time, join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status,create_user_id,update_user_id,store_type - , province,province_code,city,city_code,district,district_code,manager_supervisor + , province,province_code,city,city_code,district,district_code,manager_region_id @@ -303,6 +303,7 @@ a.franchise_brand as franchiseBrand, a.shop_status as shopStatus, a.detail_address as shopAddress + a.manager_region_id as managerRegionId from xfsg_shop_info a left join xfsg_line_info b on a.line_id = b.id left join xfsg_sign_franchise c on a.id = c.shop_id diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java index 5dc3a05b3..7375fbb64 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java @@ -53,5 +53,7 @@ public class PreparationDTO { private Long pointId; + private Long managerRegionId; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java index deb6796e2..5ecc2e41d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java @@ -149,6 +149,7 @@ public class ShopInfoDO { //区code @Column(name = "district_code") private Integer districtCode; - @Column(name = "manager_supervisor") - private String managerSupervisor; + //所属管理区域 + @Column(name = "manager_region_id") + private Long managerRegionId; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java index b0a2442f7..31aca0d72 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java @@ -44,6 +44,10 @@ public class AddBranchShopRequest { @ApiModelProperty("所属大区") private Long regionId; + @NotNull + @ApiModelProperty("所属管理区域id") + private Long managerRegionId; + public ShopInfoDO toDO(AddBranchShopRequest request, LineInfoDO lineInfo) { ShopInfoDO shopInfoDO = new ShopInfoDO(); shopInfoDO.setLineId(request.getLineId()); @@ -60,6 +64,7 @@ public class AddBranchShopRequest { shopInfoDO.setShopStage(ShopStageEnum.SHOP_STAGE_1.getShopStage()); shopInfoDO.setPartnerId(lineInfo.getPartnerId()); shopInfoDO.setFranchiseBrand(request.getFranchiseBrand()); + shopInfoDO.setManagerRegionId(request.getManagerRegionId()); return shopInfoDO; } } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index 8cace17df..5cf83f78b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -141,6 +141,11 @@ public class AddSignFranchiseRequest { @ApiModelProperty("区code") private Integer districtCode; + @NotNull(message = "所属管理区域id不能为空") + @ApiModelProperty("所属管理区域id") + private Long managerRegionId; + + public SignFranchiseDO toSignFranchiseDO() { SignFranchiseDO signFranchiseDO = new SignFranchiseDO(); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java index 47da9a7ab..c51e3a09d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java @@ -36,5 +36,7 @@ public class BranchShopDetailRequest { @ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店") @NotNull(message = "门店类型不能为空") private Integer storeType; + @ApiModelProperty("所属管理区域id") + private Long managerRegionId; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index f2656a004..198b2c297 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -229,5 +229,10 @@ public class AddSignFranchiseResponse { @ApiModelProperty("区code") private Integer districtCode; + @ApiModelProperty("所属管理区域id") + private Long managerRegionId; + + @ApiModelProperty("所属管理区域name") + private String managerRegionName; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopDetailResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopDetailResponse.java index 8c0d34a88..b1bab61c4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopDetailResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopDetailResponse.java @@ -73,4 +73,11 @@ public class BranchShopDetailResponse { @ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店") private Integer storeType; + @ApiModelProperty("所属管理区域id") + private Long managerRegionId; + + @ApiModelProperty("所属管理区域name") + private String managerRegionName; + + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java index 844233346..8b2427f02 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java @@ -55,6 +55,12 @@ public class BranchShopResponse { private Date createTime; @ApiModelProperty("开业活动完成时间") private Date openingActivityEndTime; + @ApiModelProperty("所属管理区域id") + private Long managerRegionId; + + @ApiModelProperty("所属管理区域name") + private String managerRegionName; + public void setDays() { if (this.openingActivityEndTime==null){ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/RegionResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/RegionResponse.java new file mode 100644 index 000000000..7a3236ca4 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/RegionResponse.java @@ -0,0 +1,18 @@ +package com.cool.store.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: WangShuo + * @Date: 2025/07/11/11:25 + * @Version 1.0 + * @注释: + */ +@Data +public class RegionResponse { + @ApiModelProperty("区域id") + private String regionId; + @ApiModelProperty("区域名称") + private String name; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java index 7cd2706b8..43a7a4ff4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java @@ -62,6 +62,13 @@ public class MiniShopPageVO { private String wantRegionName; @ApiModelProperty("门店状态'0.跟进中 1.已完成 2.已放弃',") private Integer shopStatus; + + @ApiModelProperty("所属管理区域id") + private Long managerRegionId; + + @ApiModelProperty("所属管理区域name") + private String managerRegionName; + public MiniShopPageVO(Long shopId, String shopName, String shopCode, Boolean flag, Long pointId, Long regionId, String regionName) { this.shopId = shopId; this.shopName = shopName; @@ -101,6 +108,8 @@ public class MiniShopPageVO { miniShopPageVO.setWantRegionName(wantRegionMap.get(shopInfo.getWantShopAreaId())); } miniShopPageVO.setShopStatus(shopInfo.getShopStatus()); + miniShopPageVO.setManagerRegionId(shopInfo.getManagerRegionId()); + miniShopPageVO.setManagerRegionName(regionNameMap.getOrDefault(shopInfo.getManagerRegionId(), "")); resultList.add(miniShopPageVO); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java index 985311b73..3c2ce85c1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java @@ -76,4 +76,10 @@ public interface DataHandlerServer { */ Boolean batchStatusRefreshYls(BatchStatusRefreshDTO batchStatusRefreshDTO); + /** + * @Auther: wangshuo + * @Date: 2025/7/11 + * @description:处理老数据 已经建店并且在标品中也建店的数据 处理所属管理区域 + */ + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java index 6a4eb37f8..5b03d2631 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java @@ -1,6 +1,7 @@ package com.cool.store.service; import com.cool.store.entity.RegionDO; +import com.cool.store.response.RegionResponse; import com.cool.store.vo.RegionPathNameVO; import java.util.List; @@ -40,4 +41,11 @@ public interface RegionService { */ List getSubRegionIdsByRegionIds(List regionIds); + /** + * @Auther: wangshuo + * @Date: 2025/7/11 + * @description:获取某区域下的所有子区域 + */ + List getSubRegionByParentId(Long regionId); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java index 8f2a8fece..796abbe6c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java @@ -10,6 +10,7 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.ThirdRegionTypeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.RegionMapper; +import com.cool.store.response.RegionResponse; import com.cool.store.service.RegionService; import com.cool.store.utils.RedisConstantUtil; import com.cool.store.utils.RedisUtilPool; @@ -158,4 +159,13 @@ public class RegionServiceImpl implements RegionService { } return regionIds; } + + @Override + public List getSubRegionByParentId(Long regionId) { + if (Objects.isNull(regionId)){ + return Lists.newArrayList(); + } + return regionMapper.getSubRegionByParentIdAndRegionType(regionId,"path"); + } + } 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 908e6e62a..47a7b0079 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 @@ -196,6 +196,7 @@ public class ShopServiceImpl implements ShopService { List subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); Map stageMap = subStageList.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, Function.identity())); List regionIds = shopList.stream().map(ShopInfoDO::getRegionId).collect(Collectors.toList()); + regionIds.addAll(Optional.of(shopList).orElse(Collections.emptyList()).stream().map(ShopInfoDO::getManagerRegionId).collect(Collectors.toList())); Map regionNameMap = regionDao.getRegionNameMap(regionIds); List investmentManagerIds = shopList.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toList()); Map userInfoMap = enterpriseUserDAO.getUserInfoMap(investmentManagerIds); @@ -391,9 +392,14 @@ 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()); String wantShopArea = hyOpenAreaInfoDAO.selectNameMapById(shopInfo.getWantShopAreaId()); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(shopInfo.getWantShopAreaId()); BranchShopDetailResponse response = new BranchShopDetailResponse(); + response.setManagerRegionId(shopInfo.getManagerRegionId()); + if (Objects.nonNull(mapperRegionByRegionId)) { + response.setManagerRegionName(mapperRegionByRegionId.getName()); + } response.setUsername(lineInfo.getUsername()); response.setMobile(lineInfo.getMobile()); response.setShopId(shopId); @@ -433,6 +439,7 @@ public class ShopServiceImpl implements ShopService { shopInfo.setJoinMode(request.getJoinMode()); shopInfo.setFranchiseBrand(request.getFranchiseBrand()); shopInfo.setStoreType(request.getStoreType()); + shopInfo.setManagerRegionId(request.getManagerRegionId()); return shopInfoDAO.updateShopInfo(shopInfo); } @@ -514,6 +521,7 @@ public class ShopServiceImpl implements ShopService { return new PageInfo<>(); } List regionIds = preparations.stream().map(PreparationDTO::getRegionId).collect(Collectors.toList()); + regionIds.addAll(Optional.of(preparations).orElse(Collections.emptyList()).stream().map(PreparationDTO::getManagerRegionId).collect(Collectors.toList())) List wantShopAreaIds = preparations.stream().map(PreparationDTO::getWantShopAreaId).collect(Collectors.toList()); List investmentManagerIds = preparations.stream().map(PreparationDTO::getInvestmentManager).collect(Collectors.toList()); List shopIds = preparations.stream().map(PreparationDTO::getId).collect(Collectors.toList()); @@ -548,6 +556,8 @@ public class ShopServiceImpl implements ShopService { response.setShopStatus(ShopStatusEnum.getDesc(dto.getShopStatus())); response.setCreateTime(dto.getCreateTime()); response.setDays(); + response.setManagerRegionId(dto.getManagerRegionId()); + response.setManagerRegionName(regionNameMap.getOrDefault(dto.getManagerRegionId(), "")); responses.add(response); } pageInfo.setList(responses); @@ -606,7 +616,7 @@ public class ShopServiceImpl implements ShopService { Integer pageSize = request.getPageSize(); String storeName = request.getStoreName(); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId); - PageInfo storeListByMobile = storeService.getStoreListByMobile(lineInfoDO.getMobile(), pageNum, pageSize, storeName,request.getStoreNum()); + PageInfo storeListByMobile = storeService.getStoreListByMobile(lineInfoDO.getMobile(), pageNum, pageSize, storeName, request.getStoreNum()); if (CollectionUtils.isEmpty(storeListByMobile.getList())) { return new PageInfo<>(new ArrayList<>()); } 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 9f806c127..732772f9b 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 @@ -267,6 +267,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu private void updateShopAndPoint(AddSignFranchiseRequest request, ShopInfoDO shopInfoDO, PointInfoDO pointInfoById) { //店铺信息 + shopInfoDO.setManagerRegionId(request.getManagerRegionId()); shopInfoDO.setRegionId(request.getRegionId()); shopInfoDO.setShopName(request.getShopName()); shopInfoDO.setDetailAddress(request.getDetailAddress()); @@ -462,6 +463,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu RegionDO regionInfo = regionMapper.getByRegionId(shopInfoDO.getRegionId()); + RegionDO managerRegion = regionMapper.getByRegionId(shopInfoDO.getManagerRegionId()); + + // if (Objects.nonNull(pointInfoDO)) { // // addSignFranchiseResponse.setStoreAddress(pointInfoDO.getAddress()); // if (StringUtils.isNoneBlank(pointInfoDO.getLatitude(), pointInfoDO.getLongitude())) { @@ -478,6 +482,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setProvinceCode(shopInfoDO.getProvinceCode()); addSignFranchiseResponse.setCityCode(shopInfoDO.getCityCode()); addSignFranchiseResponse.setDistrictCode(shopInfoDO.getDistrictCode()); + addSignFranchiseResponse.setManagerRegionId(shopInfoDO.getManagerRegionId()); + if (Objects.nonNull(managerRegion)){ + addSignFranchiseResponse.setManagerRegionName(managerRegion.getName()); + } if (Objects.nonNull(signFranchiseDO)) { addSignFranchiseResponse.setId(signFranchiseDO.getId()); addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionController.java index 278de5ba3..c089cd757 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionController.java @@ -1,6 +1,7 @@ package com.cool.store.controller.webb; import com.cool.store.entity.RegionDO; +import com.cool.store.response.RegionResponse; import com.cool.store.response.ResponseResult; import com.cool.store.service.RegionService; import io.swagger.annotations.Api; @@ -46,4 +47,11 @@ public class RegionController { return ResponseResult.success(regionService.getBelongWarRegionName(regionId)); } + @ApiOperation("过去下级区域") + @GetMapping("/getSubRegionByParentId") + public ResponseResult> getSubRegionByParentId(@RequestParam(value = "regionId", required = true) Long regionId) { + return ResponseResult.success(regionService.getSubRegionByParentId(regionId)); + } + + }