From f8943f618a14796d3b2b280e7bd5aaa05b139283 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 7 Aug 2025 19:28:14 +0800 Subject: [PATCH] =?UTF-8?q?//=EF=BC=8C=E5=8A=A0=E7=9B=9F=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E8=87=AA=E6=9C=89=E5=BA=97->=E5=8A=A0=E7=9B=9F=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=BB=BA=E5=BA=97=20=E4=B8=8D=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E5=86=8Dcrm=E4=B8=AD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/request/hqt/HqtBuildAPIRequest.java | 8 ++++++-- .../cool/store/service/impl/HqtAPIServiceImpl.java | 12 ++++++++---- .../store/service/impl/SignFranchiseServiceImpl.java | 6 ++++-- 3 files changed, 18 insertions(+), 8 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 0abe459a1..d8a62988d 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 @@ -105,9 +105,13 @@ public class HqtBuildAPIRequest { @JsonProperty("bizType") /** - * @description:默认值 + * @description: + * 2148799018--加盟建店 + * 2148784001--加盟公司建店 + * 2148799024--对外业务 + * 目前只推送2148799018--加盟建店 */ - private String bizType = "202684487985"; + private String bizType = "2148799018"; /** * @description:默认值 */ 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 cd45d4f05..23fdee71f 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 @@ -5,12 +5,10 @@ import com.cool.store.dao.BigRegionDAO; import com.cool.store.dao.ShopInfoDAO; import com.cool.store.dto.HqtTokenDTO; import com.cool.store.entity.BigRegionDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.FranchiseBrandEnum; +import com.cool.store.entity.ShopInfoDO; +import com.cool.store.enums.*; import com.cool.store.enums.HqtEnum.HqtShopDecorationAttributesEnum; import com.cool.store.enums.HqtEnum.HqtSignFeeEnum; -import com.cool.store.enums.SatisfactionEnum; -import com.cool.store.enums.ShopDecorationAttributesEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.ConfirmQuotationRequest; import com.cool.store.request.HqtBuildRequest; @@ -66,6 +64,12 @@ public class HqtAPIServiceImpl implements HqtAPIService { //@Async public void pushHqtBuild(HqtBuildRequest request) { log.info("开始推送门店信息request:{}",JSONObject.toJSONString(request)); + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + //，加盟公司自有店->加盟公司建店 不推送数据 再crm中完成 + if ( shopInfo.getJoinMode().equals(JoinModeEnum.FRANCHISE_COMPANIES.getCode())){ + log.info("加盟公司自有店->加盟公司建店 不推送数据 再crm中完成"); + return; + } Boolean check = request.check(); if (!check) { throw new ServiceException(ErrorCodeEnum.HQT_PARAMS_ERROR); 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 b632b8deb..a5352f493 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 @@ -387,8 +387,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu SHOP_SUB_STAGE_STATUS_863, SHOP_SUB_STAGE_STATUS_91, SHOP_SUB_STAGE_STATUS_112, SHOP_SUB_STAGE_STATUS_123, SHOP_SUB_STAGE_STATUS_143 )); }else{ - hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); - + //，加盟公司自有店->加盟公司建店 不推送数据 再crm中完成 + if ( !shopInfoDO.getJoinMode().equals(JoinModeEnum.FRANCHISE_COMPANIES.getCode())){ + hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); + } } shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause());