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

Merge branch 'master' into cc_20250710_userRegion

Browse Source 
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java
This commit is contained in:
苏竹红
2025-07-23 17:35:05 +08:00
parent 2110c40298 13e6f81286
commit 1c7bfc2d2e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,7 +418,7 @@ public class PointServiceImpl implements PointService {
ShopInfoDO updateShopInfo = new ShopInfoDO(); ShopInfoDO updateShopInfo = new ShopInfoDO();
updateShopInfo.setId(pointInfo.getShopId()); updateShopInfo.setId(pointInfo.getShopId());
updateShopInfo.setRegionId(pointInfo.getRegionId()); updateShopInfo.setRegionId(pointInfo.getRegionId());
updateShopInfo.setShopName(pointInfo.getPointName()); //updateShopInfo.setShopName(pointInfo.getPointName());
shopInfoDAO.updateShopInfo(updateShopInfo); shopInfoDAO.updateShopInfo(updateShopInfo);
shopStageInfoDAO.batchUpdateShopStageStatus(pointInfo.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20)); shopStageInfoDAO.batchUpdateShopStageStatus(pointInfo.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20));
preparationService.selectSiteAndBuildStoreComplete(pointInfo.getShopId()); preparationService.selectSiteAndBuildStoreComplete(pointInfo.getShopId());

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
View File

@@ -98,7 +98,7 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
BigRegionDO byRegionId = bigRegionDAO.getByRegionId(shopInfo.getRegionId()); BigRegionDO byRegionId = bigRegionDAO.getByRegionId(shopInfo.getRegionId());
if (byRegionId != null) { if (byRegionId != null) {
requestBody.setStore_area(byRegionId.getStoreManageRegionId() == null requestBody.setStore_area(byRegionId.getStoreManageRegionId() == null
? shopInfo.getRegionId().toString() : shopInfo.getManagerRegionId().toString()); ? shopInfo.getRegionId().toString() : byRegionId.getStoreManageRegionId().toString());
} else { } else {
requestBody.setStore_area(shopInfo.getRegionId().toString()); requestBody.setStore_area(shopInfo.getRegionId().toString());
} }