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

Merge branch 'cc_20250723_Decoration' into 'master'

Browse Source 
//，加盟公司自有店->加盟公司建店 不推送数据 再crm中完成

See merge request hangzhou/java/custom_zxjp!144
This commit is contained in:
苏竹红
2025-08-07 11:30:17 +00:00
parent b3a92b1638 f8943f618a
commit d4e2f21f6e
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java
View File

@@ -105,9 +105,13 @@ public class HqtBuildAPIRequest {
@JsonProperty("bizType") @JsonProperty("bizType")
/** /**
* @description:默认值 * @description:
* 2148799018--加盟建店
* 2148784001--加盟公司建店
* 2148799024--对外业务
* 目前只推送2148799018--加盟建店
*/ */
private String bizType = "202684487985"; private String bizType = "2148799018";
/** /**
* @description:默认值 * @description:默认值
*/ */

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java
View File

@@ -5,12 +5,10 @@ import com.cool.store.dao.BigRegionDAO;
import com.cool.store.dao.ShopInfoDAO; import com.cool.store.dao.ShopInfoDAO;
import com.cool.store.dto.HqtTokenDTO; import com.cool.store.dto.HqtTokenDTO;
import com.cool.store.entity.BigRegionDO; import com.cool.store.entity.BigRegionDO;
import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.entity.ShopInfoDO;
import com.cool.store.enums.FranchiseBrandEnum; import com.cool.store.enums.*;
import com.cool.store.enums.HqtEnum.HqtShopDecorationAttributesEnum; import com.cool.store.enums.HqtEnum.HqtShopDecorationAttributesEnum;
import com.cool.store.enums.HqtEnum.HqtSignFeeEnum; 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.exception.ServiceException;
import com.cool.store.request.ConfirmQuotationRequest; import com.cool.store.request.ConfirmQuotationRequest;
import com.cool.store.request.HqtBuildRequest; import com.cool.store.request.HqtBuildRequest;
@@ -66,6 +64,12 @@ public class HqtAPIServiceImpl implements HqtAPIService {
//@Async //@Async
public void pushHqtBuild(HqtBuildRequest request) { public void pushHqtBuild(HqtBuildRequest request) {
log.info("开始推送门店信息request:{}",JSONObject.toJSONString(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(); Boolean check = request.check();
if (!check) { if (!check) {
throw new ServiceException(ErrorCodeEnum.HQT_PARAMS_ERROR); throw new ServiceException(ErrorCodeEnum.HQT_PARAMS_ERROR);

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -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 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{ }else{
//，加盟公司自有店->加盟公司建店 不推送数据 再crm中完成
if ( !shopInfoDO.getJoinMode().equals(JoinModeEnum.FRANCHISE_COMPANIES.getCode())){
hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId()));
}
} }
shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER);
shopAuditInfoDO.setPassReason(request.getCause()); shopAuditInfoDO.setPassReason(request.getCause());