From 7267868f16000e97ed35d7fbdf0a759bff4de57a Mon Sep 17 00:00:00 2001 From: wangff Date: Thu, 13 Nov 2025 11:19:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=89=80=E5=B1=9E=E5=A4=A7=E5=8C=BA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=93=81=E7=89=8C=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dao/BigRegionDAO.java | 9 +++++++-- .../main/java/com/cool/store/mapper/BigRegionMapper.java | 2 +- .../src/main/resources/mapper/BigRegionMapper.xml | 3 +++ .../src/main/java/com/cool/store/entity/BigRegionDO.java | 6 ++++++ .../java/com/cool/store/service/BigRegionService.java | 2 +- .../cool/store/service/impl/BigRegionServiceImpl.java | 4 ++-- .../cool/store/service/impl/DataHandlerServerImpl.java | 2 +- .../cool/store/controller/webb/BigRegionController.java | 5 +++-- 8 files changed, 24 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java index a7313979f..732e09798 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java @@ -3,6 +3,7 @@ package com.cool.store.dao; import com.cool.store.dto.region.BigRegionDTO; import com.cool.store.entity.BigRegionDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.FranchiseBrandEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.BigRegionMapper; import com.cool.store.request.QueryBigRegionRequest; @@ -12,6 +13,7 @@ import tk.mybatis.mapper.entity.Example; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -25,8 +27,11 @@ public class BigRegionDAO { @Resource BigRegionMapper bigRegionMapper; - public List queryAllBigRegion(String keyword){ - return bigRegionMapper.queryAllBigRegion(keyword); + public List queryAllBigRegion(String keyword, Integer joinBrand){ + if (Objects.isNull(joinBrand)) { + joinBrand = FranchiseBrandEnum.ZXJP.getCode(); + } + return bigRegionMapper.queryAllBigRegion(keyword, joinBrand); } public BigRegionDO queryOrgInfoByBigRegionAndJoinMode(Long regionId, Integer joinMode){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BigRegionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BigRegionMapper.java index e1b8c5d37..3a29d94d6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BigRegionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BigRegionMapper.java @@ -15,7 +15,7 @@ public interface BigRegionMapper extends Mapper { * @param keyword * @return */ - List queryAllBigRegion(String keyword); + List queryAllBigRegion(@Param("keyword") String keyword, @Param("joinBrand") Integer joinBrand); /** * 根据所属大区与加盟模式查询新管家信息 diff --git a/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml index 318359df6..2bc693f67 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml @@ -38,6 +38,9 @@ and region_name like CONCAT('%',#{keyword},'%') + + and join_brand = #{joinBrand} + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/BigRegionDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/BigRegionDO.java index 395574881..3d1b91047 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/BigRegionDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/BigRegionDO.java @@ -70,6 +70,12 @@ public class BigRegionDO { @Column(name = "hqt_region_name") private String hqtRegionName; + /** + * 加盟品牌 + */ + @Column(name = "join_brand") + private Integer joinBrand; + public String getHqtRegionName() { return hqtRegionName; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/BigRegionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/BigRegionService.java index 19df3e8a7..f32a099e2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/BigRegionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/BigRegionService.java @@ -21,7 +21,7 @@ public interface BigRegionService { * @param keyword 关键字 * @return */ - List queryAllBigRegion(String keyword); + List queryAllBigRegion(String keyword, Integer joinBrand); /** * 根据门店所属大区和加盟模式查询新管家对应组织信息 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BigRegionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BigRegionServiceImpl.java index d2751cb00..166263a54 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BigRegionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BigRegionServiceImpl.java @@ -25,8 +25,8 @@ public class BigRegionServiceImpl implements BigRegionService { BigRegionDAO bigRegionDAO; @Override - public List queryAllBigRegion(String keyword){ - return bigRegionDAO.queryAllBigRegion(keyword); + public List queryAllBigRegion(String keyword, Integer joinBrand){ + return bigRegionDAO.queryAllBigRegion(keyword, joinBrand); } @Override 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 872f9fb52..efcef8449 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 @@ -1170,7 +1170,7 @@ public class DataHandlerServerImpl implements DataHandlerServer { shopInfoDO.setManagerRegionId(isCreateStoreDTO.getPid()); updateList.add(shopInfoDO); } - List bigRegionDTOS = bigRegionDAO.queryAllBigRegion(null); + List bigRegionDTOS = bigRegionDAO.queryAllBigRegion(null, null); Map bigRegionDTOMap = bigRegionDTOS.stream().collect(Collectors.toMap(BigRegionDTO::getRegionId, x -> x)); //XX大区 正烧鸡 List storeManageIds = bigRegionDTOS.stream().filter(x -> x.getStoreManageRegionId() != null).map(BigRegionDTO::getStoreManageRegionId).collect(Collectors.toList()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/BigRegionController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/BigRegionController.java index c16945bf8..0b1a4e1e1 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/BigRegionController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/BigRegionController.java @@ -28,8 +28,9 @@ public class BigRegionController { @PostMapping("/queryAllBigRegion") @ApiOperation("获取所有可选择的大区") - public ResponseResult> queryContentInfo(@RequestParam(required = false) String keyword) { - return ResponseResult.success(bigRegionService.queryAllBigRegion(keyword)); + public ResponseResult> queryContentInfo(@RequestParam(required = false) String keyword, + @RequestParam(required = false) Integer joinBrand) { + return ResponseResult.success(bigRegionService.queryAllBigRegion(keyword, joinBrand)); } @PostMapping("/queryBigRegion")