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

Merge #118 into master from cc_20260506_newsign

Browse Source 
feat:addShopDecorationLog

* cc_20260506_newsign: (14 commits squashed)

  - feat：新签调整

  - feat：招商

  - feat：招商

  - feat：招商

  - feat：招商

  - feat：id

  - feat:招商副总裁审核

  - feat:招商经理

  - feat:招商经理

  - feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核

  - feat:SHOP_SUB_STAGE_STATUS_150_5

  - feat:建店代办处理

  - feat:addShopDecorationLog

  - feat:addShopDecorationLog

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/118
This commit is contained in:
正新
2026-05-10 13:10:42 +00:00
parent 814bbc342e
commit b9b022a28d
28 changed files with 589 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-common/src/main/java/com/cool/store/enums/AuditExecuteEnum.java
View File

@@ -9,7 +9,8 @@ package com.cool.store.enums;
public enum AuditExecuteEnum {
FRANCHISEES(0, "加盟商提交"),
OPERATION(1, "运营初审"),
HEADQUARTERS(2, "总部受理");
HEADQUARTERS(2, "总部受理"),
MANAGER(3, "待招商副总裁审核");
private int code;
private String desc;
AuditExecuteEnum(int code, String desc) {

6
coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
View File

@@ -75,9 +75,13 @@ public enum UserRoleEnum {
INVESTMENT_MANGER(1765266125369L, "招商经理"),
OPERATION_GENERAL_CONSULTANT(1764642515446L,"运营片区总顾问"),
ORDER_GROUP(1766387359609L,"订单组"),
DELIVERY_SPECIALIST(1767591430954L,"外卖专员"),
AI_STORE_TYPE_APPROVE(1774252055402L,"AI店型订单审核"),
DEVICE_SHIPMENT_HM(1775108261858L,"设备发货-火码"),
DEVICE_SHIPMENT_CG(1775108280524L,"设备发货-采购")
DEVICE_SHIPMENT_CG(1775108280524L,"设备发货-采购"),
OPERATION_VICE_PRESIDENT(1778035765077L, "运营副总裁"),
INVESTMENT_PRESIDENT(1778053561302L, "招商副总裁"),
;
private Long code;

6
coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
View File

@@ -21,7 +21,8 @@ public enum ShopSubStageStatusEnum {
//上传租赁合同
SHOP_SUB_STAGE_STATUS_20(ShopSubStageEnum.SHOP_STAGE_2, 200, "待加盟商上传", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "待招商经理审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "待招商片区老总审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_21_5(ShopSubStageEnum.SHOP_STAGE_2, 215, "待分部内勤审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_22(ShopSubStageEnum.SHOP_STAGE_2, 220, "审核未通过", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_23(ShopSubStageEnum.SHOP_STAGE_2, 230, "审核通过", Boolean.TRUE),
@@ -50,6 +51,7 @@ public enum ShopSubStageStatusEnum {
//加盟合同签约
SHOP_SUB_STAGE_STATUS_80(ShopSubStageEnum.SHOP_STAGE_8, 800, "待加盟内勤/大区内勤提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_83(ShopSubStageEnum.SHOP_STAGE_8, 830, "待分部内勤审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_83_2(ShopSubStageEnum.SHOP_STAGE_8, 832, "待招商副总裁审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_83_5(ShopSubStageEnum.SHOP_STAGE_8, 835, "待财务审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_84(ShopSubStageEnum.SHOP_STAGE_8, 840, "已签约", Boolean.TRUE),
SHOP_SUB_STAGE_STATUS_85(ShopSubStageEnum.SHOP_STAGE_8, 850, "审核失败", Boolean.FALSE),
@@ -90,7 +92,7 @@ public enum ShopSubStageStatusEnum {
//平台资料提交
SHOP_SUB_STAGE_STATUS_150(ShopSubStageEnum.SHOP_STAGE_15, 1500, "待加盟商提交", Boolean.FALSE),
// 2025-12-26 加盟开店管理流程调整，新增“待运营顾问审核”，删除1520、1530、1540、1550阶段，
SHOP_SUB_STAGE_STATUS_150_5(ShopSubStageEnum.SHOP_STAGE_15, 1505, "待运营顾问审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_150_5(ShopSubStageEnum.SHOP_STAGE_15, 1505, "待招商经理审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_151(ShopSubStageEnum.SHOP_STAGE_15, 1510, "待圆规物流填写", Boolean.FALSE),
// ----- 以下子阶段删除 -----
SHOP_SUB_STAGE_STATUS_152(ShopSubStageEnum.SHOP_STAGE_15, 1520, "待财务填写",Boolean.FALSE),