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

Merge #124 into master from cc_20260511_fix

Browse Source 
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: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/124
This commit is contained in:
正新
2026-05-11 09:01:25 +00:00
parent ae241d40ca
commit 5568f6678d
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java
View File

@@ -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());