From 5568f6678d827b086140a77fa9b78f1e2570d0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Mon, 11 May 2026 09:01:25 +0000 Subject: [PATCH] Merge #124 into master from cc_20260511_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat：不需要运营顾问 也能推送 * cc_20260511_fix: (6 commits squashed) - feat:待采购确认 审批流程 - feat:问题修复 - feat:ADVERTISEMENT_FEE VIDEO_DEVICE_FEE - feat:ADVERTISEMENT_FEE VIDEO_DEVICE_FEE - Merge branch 'master' into cc_20260511_fix # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java - feat：不需要运营顾问 也能推送 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/124 --- .../cool/store/service/impl/DecorationHandleServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java index be04a946d..c9b44c9f4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java @@ -178,8 +178,7 @@ public class DecorationHandleServiceImpl implements DecorationHandleService { } //配置的系统是红圈通 且不是加盟公司自有店 则推送数据 也就是配置了crm或者是加盟公司自有店 走crm流程 //2026开始 自有店也开始走红圈通 - // 已分配运营顾问的情况下推送 - if (teamInfo.getUseSystem().equals(DecorationUseSystemEnum.HQT.getCode()) && StringUtils.isNotBlank(shopInfoDO.getOperationsConsultant())){ + if (teamInfo.getUseSystem().equals(DecorationUseSystemEnum.HQT.getCode())){ hqtAPIService.pushHqtBuild(signFranchiseService.getHqtBuildRequest(shopInfoDO.getId())); } shopDecorationAssign.setDecorationDescStatus(DecorationDescStatus.ASSIGNED.getCode());