From 6370f8129fae34df6c7826af3aa1d8edebdf125f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 8 Aug 2025 17:31:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BA=A2=E5=9C=88=E9=80=9A=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/hqt/HqtBuildAPIRequest.java | 6 +++--- .../java/com/cool/store/service/impl/HqtAPIServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java index aaf98f78d..329646857 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java @@ -62,10 +62,10 @@ public class HqtBuildAPIRequest { private String field5__c; /** - * field62__c 联系人(老板)手机号 + * field6__c 联系人(老板)手机号 */ - @JsonProperty("field62__c") - private String field62__c; + @JsonProperty("field6__c") + private String field6__c; /** diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java index 23fdee71f..9983f8452 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java @@ -207,7 +207,7 @@ public class HqtAPIServiceImpl implements HqtAPIService { hqtBuildAPIRequest.setField94__c(request.getSupervisorName()); hqtBuildAPIRequest.setField4__c(request.getSupervisorMobile()); hqtBuildAPIRequest.setField5__c(request.getPartnershipSignatoryFirst()); - hqtBuildAPIRequest.setField62__c(request.getPartnershipSignatoryFirstMobile()); + hqtBuildAPIRequest.setField6__c(request.getPartnershipSignatoryFirstMobile()); hqtBuildAPIRequest.setStreet(request.getShopAddress()); hqtBuildAPIRequest.setField8__c(field8__c); hqtBuildAPIRequest.setField123__c(field123__c); From 1e730b79a699eff7b43e6bbff27cde2c750e9ece Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 9 Aug 2025 19:35:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E6=B5=8B=E9=87=8F=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/PreparationServiceImpl.java | 1 - .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index 09a5aa02f..b1c786bae 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -204,7 +204,6 @@ public class PreparationServiceImpl implements PreparationService { list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1); - list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_150); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index a5352f493..fc8a7e5ba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -391,6 +391,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if ( !shopInfoDO.getJoinMode().equals(JoinModeEnum.FRANCHISE_COMPANIES.getCode())){ hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); } + shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861); } shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); From 89cf44132e5a5a1f6089b7a6bd84306132f6f128 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 9 Aug 2025 19:52:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20=20=E6=8E=A8=E9=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9E=9A=E4=B8=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/HqtAPIServiceImpl.java | 2 +- .../java/com/cool/store/controller/webb/PCTestController.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java index 9983f8452..51091e351 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java @@ -66,7 +66,7 @@ public class HqtAPIServiceImpl implements HqtAPIService { log.info("开始推送门店信息request:{}",JSONObject.toJSONString(request)); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); //，加盟公司自有店->加盟公司建店 不推送数据 再crm中完成 - if ( shopInfo.getJoinMode().equals(JoinModeEnum.FRANCHISE_COMPANIES.getCode())){ + if ( shopInfo.getJoinMode().equals(JoinModeEnum.OWN_STORE.getCode())){ log.info("加盟公司自有店->加盟公司建店 不推送数据 再crm中完成"); return; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index cebf0ec0f..64c87bda8 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -538,6 +538,7 @@ public class PCTestController { EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getInvestmentManager()); BigRegionDO bigRegionDO = bigRegionDAO.getByRegionId(shopInfo.getRegionId()); HqtBuildRequest request = new HqtBuildRequest(); + request.setShopId(shopId); request.setShopCode(shopInfo.getShopCode()); request.setShopName(shopInfo.getShopName()); request.setShopDecorationAttributes(shopInfo.getShopDecorationAttributes());