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

Merge #30 into master from cc_20260106_process_change

Browse Source 
fix:加盟合同签约及建店资料修改

* cc_20260106_process_change: (6 commits squashed)

  - fix:加盟合同签约新增财务审批

  - fix:建店资料阶段逻辑修改

  - fix:加盟合同签约待办，财务查看待财务审批的待办

  - feat:城市规划

  - feat:行政区划接口;
    fix:城市规划修改

  - fix:加盟合同签约审批日志逻辑修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-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/30
This commit is contained in:
王非凡
2026-01-19 09:11:34 +00:00
committed by 正新
parent eb9b8bdf00
commit c28515123a
41 changed files with 1259 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
View File

@@ -331,4 +331,9 @@ public class RedisConstant {
* 每刻退款用户信息
*/
public static final String MK_USER_MAPPING = "zxjp_mk_user_mapping";
/**
* 建店资料总部订货收款账户信息
*/
public static final String BUILD_RECEIVE_BANK_INFO = "zxjp_build_receive_bank_info";
}

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -369,6 +369,7 @@ public enum ErrorCodeEnum {
TP_PENALTY_APPLY_INEFFECTIVE(1810010, "该处罚单未生效无法完成缴费", null),
TP_PENALTY_APPLY_NO_NEED_PAY(1810011, "该处罚单无需缴费", null),
CITY_PLANNING_EXISTS(1820001, "同年份同季度同省市已存在规划，不能重复添加", null),
;

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

@@ -50,6 +50,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_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),
@@ -88,11 +89,15 @@ 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_151(ShopSubStageEnum.SHOP_STAGE_15, 1510, "待圆规物流填写", Boolean.FALSE),
// ----- 以下子阶段删除 -----
SHOP_SUB_STAGE_STATUS_152(ShopSubStageEnum.SHOP_STAGE_15, 1520, "待财务填写",Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_153(ShopSubStageEnum.SHOP_STAGE_15, 1530, "待分部总监审批",Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_154(ShopSubStageEnum.SHOP_STAGE_15, 1540, "待分管副总裁审批",Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_155(ShopSubStageEnum.SHOP_STAGE_15, 1550, "待总裁审批",Boolean.FALSE),
// ----- 以上 -----
SHOP_SUB_STAGE_STATUS_156(ShopSubStageEnum.SHOP_STAGE_15, 1560, "已完成", Boolean.TRUE),
//POS