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

Merge branch 'cc_20250723_fix' into 'master'

Browse Source 
Cc 20250723 fix

See merge request hangzhou/java/custom_zxjp!137
This commit is contained in:
苏竹红
2025-07-23 01:49:10 +00:00
parent 7e5a0e440a 80e56b6b45
commit 163f747e77
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-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java
View File

@@ -58,7 +58,7 @@ public class OpenApiValidateFilter implements Filter {
} }
MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID()); MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID());
//statusRefresh 放开不需要验签 //statusRefresh 放开不需要验签
if(uri.startsWith("/zxjp/open/statusRefresh/")){ if(uri.startsWith("/zxjp/open/v1")){
filterChain.doFilter(servletRequest, response); filterChain.doFilter(servletRequest, response);
return; return;
} }