suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #24 into master from cc_20260107_fix_bug

Browse Source 
fix:铺位提交时区域取招商区域

* cc_20260107_fix_bug: (3 commits squashed)

  - fix:铺位区域覆盖门店招商区域

  - fix:铺位提交时区域取线索的招商区域

  - fix:铺位提交时区域取招商区域

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/24
This commit is contained in:
王非凡
2026-01-07 02:01:12 +00:00
committed by 苏竹红
parent a2262f8ea7
commit e62cd9bff9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -893,7 +893,7 @@ public class PointServiceImpl implements PointService {
updateShop.setId(shopId); updateShop.setId(shopId);
// updateShop.setShopName(pointInfo.getPointName()); // updateShop.setShopName(pointInfo.getPointName());
updateShop.setPointId(pointId); updateShop.setPointId(pointId);
updateShop.setRegionId(pointInfo.getRegionId()); updateShop.setInvestRegionId(pointInfo.getRegionId());
shopInfoDAO.updateShopInfo(updateShop); shopInfoDAO.updateShopInfo(updateShop);
ShopSubStageStatusEnum selectStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11; ShopSubStageStatusEnum selectStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11;
PointDetailInfoDO updateDetail = new PointDetailInfoDO(); PointDetailInfoDO updateDetail = new PointDetailInfoDO();
@@ -947,7 +947,7 @@ public class PointServiceImpl implements PointService {
if (request.getShopId() == null) { if (request.getShopId() == null) {
PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request); PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request);
PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request); PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request);
pointInfo.setRegionId(lineInfo.getRegionId()); pointInfo.setRegionId(lineInfo.getInvestRegionId());
pointInfo.setLineId(lineId); pointInfo.setLineId(lineId);
pointInfo.setSelectStatus(SelectStatusEnum.SELECT_STATUS_0.getCode()); pointInfo.setSelectStatus(SelectStatusEnum.SELECT_STATUS_0.getCode());
pointInfo.setPointSource(PointSourceEnum.POINT_SOURCE_2.getCode()); pointInfo.setPointSource(PointSourceEnum.POINT_SOURCE_2.getCode());
@@ -968,7 +968,7 @@ public class PointServiceImpl implements PointService {
} }
PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request); PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request);
PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request); PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request);
pointInfo.setRegionId(shopInfo.getRegionId()); pointInfo.setRegionId(shopInfo.getInvestRegionId());
pointInfo.setLineId(lineId); pointInfo.setLineId(lineId);
pointInfo.setShopId(shopInfo.getId()); pointInfo.setShopId(shopInfo.getId());
pointInfo.setSelectStatus(SelectStatusEnum.SELECT_STATUS_1.getCode()); pointInfo.setSelectStatus(SelectStatusEnum.SELECT_STATUS_1.getCode());