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

Merge #144 into master from cc_20260520_unify_merge

Browse Source 
0520需求汇总

* cc_20260520_unify_merge: (22 commits squashed)

  - fix:正新鸡排信发自动开通改造

  - fix:环境配置

  - fix

  - fix:信发门店设备信息接口入参修改

  - fix:信发门店设备信息接口入参修改

  - fix:新增根据门店id查询设备接口

  - fix

  - fix:限制设备数量

  - fix:问题修复

  - fix:网点信息获取转义；网点/设备创建异常抛出

  - fix:更新开业报备流程完成日期、首次在营业状态时间

  - fix

  - fix:云流水&新管家账号关闭接口传入闭店原因；新增闭店原因违约闭店

  - fix:闭店信息新增字段

  - Merge branch 'master' into cc_20260518_store_date

  - fix:开店流程完成状态判断排除食安阶段

  - fix

  - fix

  - Merge branch 'cc_20260514_xinfa_modify' into cc_20260520_unify_merge
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

  - Merge branch 'cc_20260518_store_date' into cc_20260520_unify_merge

  - Merge branch 'cc_20260520_close_store_optimize' into cc_20260520_unify_merge

  - Merge remote-tracking branch 'origin/cc_20260518_close_reason' into cc_20260520_unify_merge

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/144
This commit is contained in:
王非凡
2026-05-20 08:44:35 +00:00
committed by 正新
parent b89e8c9352
commit 3e227cc5fb
38 changed files with 876 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,6 +505,9 @@ public enum ErrorCodeEnum {
NO_PERMISSION_TO_DELETE_THE_RECORD(1850006, "无权限删除该记录", null),
THE_AUDIO_GENERATION_RECORD_DOES_NOT_EXIST(1850007, "音频生成记录不存在", null),
CREATE_XIN_FA_DEVICE_ERROR(1860000, "创建设备失败", null),
XIN_FA_DEVICE_NUM_LIMIT(1860001, "电视机及广告机数量均不能超过5台", null),
;

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

@@ -21,6 +21,7 @@ public enum StoreCloseReasonEnum {
REASON3(3, "加盟老板失联", StoreCloseNatureEnum.REQUIRE_CLOSE),
REASON4(4, "其他严重违反加盟规定", StoreCloseNatureEnum.REQUIRE_CLOSE),
REASON5(5, "卫生操作不达标", StoreCloseNatureEnum.REQUIRE_CLOSE),
REASON11(11, "违约闭店", StoreCloseNatureEnum.REQUIRE_CLOSE),
REASON6(6, "人员不足", StoreCloseNatureEnum.ONESELF_CLOSE),
REASON7(7, "商圈转移或拆迁", StoreCloseNatureEnum.ONESELF_CLOSE),

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

@@ -147,6 +147,8 @@ public enum ShopSubStageStatusEnum {
//信发系统开通
SHOP_SUB_STAGE_STATUS_230(ShopSubStageEnum.SHOP_STAGE_23, 2300, "待【火码】提交", Boolean.FALSE),
// 正新鸡排初始化为这个阶段，同原来阶段区分开
SHOP_SUB_STAGE_STATUS_233(ShopSubStageEnum.SHOP_STAGE_23, 2330, "待填写设备数量", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_235(ShopSubStageEnum.SHOP_STAGE_23, 2350, "已完成", Boolean.TRUE),
//营帐通开通