From e62cd9bff9ba9982dc7f6a0e0a0e045b936bd6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Wed, 7 Jan 2026 02:01:12 +0000 Subject: [PATCH] Merge #24 into master from cc_20260107_fix_bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:铺位提交时区域取招商区域 * cc_20260107_fix_bug: (3 commits squashed) - fix:铺位区域覆盖门店招商区域 - fix:铺位提交时区域取线索的招商区域 - fix:铺位提交时区域取招商区域 Signed-off-by: 王非凡 Reviewed-by: 苏竹红 <570057076@qq.com> Merged-by: 苏竹红 <570057076@qq.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/24 --- .../java/com/cool/store/service/impl/PointServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 06b5bc244..1a8c78e9b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -893,7 +893,7 @@ public class PointServiceImpl implements PointService { updateShop.setId(shopId); // updateShop.setShopName(pointInfo.getPointName()); updateShop.setPointId(pointId); - updateShop.setRegionId(pointInfo.getRegionId()); + updateShop.setInvestRegionId(pointInfo.getRegionId()); shopInfoDAO.updateShopInfo(updateShop); ShopSubStageStatusEnum selectStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11; PointDetailInfoDO updateDetail = new PointDetailInfoDO(); @@ -947,7 +947,7 @@ public class PointServiceImpl implements PointService { if (request.getShopId() == null) { PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request); PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request); - pointInfo.setRegionId(lineInfo.getRegionId()); + pointInfo.setRegionId(lineInfo.getInvestRegionId()); pointInfo.setLineId(lineId); pointInfo.setSelectStatus(SelectStatusEnum.SELECT_STATUS_0.getCode()); pointInfo.setPointSource(PointSourceEnum.POINT_SOURCE_2.getCode()); @@ -968,7 +968,7 @@ public class PointServiceImpl implements PointService { } PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request); PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request); - pointInfo.setRegionId(shopInfo.getRegionId()); + pointInfo.setRegionId(shopInfo.getInvestRegionId()); pointInfo.setLineId(lineId); pointInfo.setShopId(shopInfo.getId()); pointInfo.setSelectStatus(SelectStatusEnum.SELECT_STATUS_1.getCode());