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

Merge branch 'cc_20250809_fix' into 'master'

Browse Source 
fix  推送数据枚举错误

See merge request hangzhou/java/custom_zxjp!149
This commit is contained in:
苏竹红
2025-08-09 11:53:36 +00:00
parent 2332a841b2 89cf44132e
commit 6aac1a4925
2 changed files with 2 additions and 1 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/HqtAPIServiceImpl.java
View File

@@ -66,7 +66,7 @@ public class HqtAPIServiceImpl implements HqtAPIService {
log.info("开始推送门店信息request:{}",JSONObject.toJSONString(request)); log.info("开始推送门店信息request:{}",JSONObject.toJSONString(request));
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
//，加盟公司自有店->加盟公司建店 不推送数据 再crm中完成 //，加盟公司自有店->加盟公司建店 不推送数据 再crm中完成
if ( shopInfo.getJoinMode().equals(JoinModeEnum.FRANCHISE_COMPANIES.getCode())){ if ( shopInfo.getJoinMode().equals(JoinModeEnum.OWN_STORE.getCode())){
log.info("加盟公司自有店->加盟公司建店 不推送数据 再crm中完成"); log.info("加盟公司自有店->加盟公司建店 不推送数据 再crm中完成");
return; return;
} }

1
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
View File

@@ -538,6 +538,7 @@ public class PCTestController {
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getInvestmentManager()); EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getInvestmentManager());
BigRegionDO bigRegionDO = bigRegionDAO.getByRegionId(shopInfo.getRegionId()); BigRegionDO bigRegionDO = bigRegionDAO.getByRegionId(shopInfo.getRegionId());
HqtBuildRequest request = new HqtBuildRequest(); HqtBuildRequest request = new HqtBuildRequest();
request.setShopId(shopId);
request.setShopCode(shopInfo.getShopCode()); request.setShopCode(shopInfo.getShopCode());
request.setShopName(shopInfo.getShopName()); request.setShopName(shopInfo.getShopName());
request.setShopDecorationAttributes(shopInfo.getShopDecorationAttributes()); request.setShopDecorationAttributes(shopInfo.getShopDecorationAttributes());