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

Merge #17 into master from cc_20251218_opening

Browse Source 
Merge branch 'master' into cc_20251218_opening

* cc_20251218_opening: (11 commits squashed)

  - fix:信发查询bug

  - fix:信发查询bug

  - fix:测试

  - fix:老店新开不需要开业验收

  - feat:开业验收数据处理

  - fix:开业验收bug修复

  - fix:开业验收bug修复

  - fix:云流水权限开通

  - feat:开业验收数据处理

  - feat:开业验收数据处理

  - Merge branch 'master' into cc_20251218_opening

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/17
This commit is contained in:
苏竹红
2025-12-25 10:50:38 +00:00
parent 32ae1b7315
commit e97c147fac
31 changed files with 824 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ public enum AuditTypeEnum {
YING_ZHANG_TONG(14,"营帐通"),
BUILDINFORMATION(15,"建店资料信息"),
JINg_DONG_WAI_MAI(16,"京东外卖"),
OPENING_ACCEPTANCE(17,"开业验收"),
;
private Integer code;

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

@@ -71,6 +71,8 @@ public enum UserRoleEnum {
JING_DONG_HEADQUARTERS_BUILD_CUSTOMER(510000000L,"京东总部建店客服"),
FRANCHISEES(530000000L,"加盟商"),
SERVICE_PACKAGE_DEDICATED(1762761165005L,"服务包专用"),
OPERATION_GENERAL_CONSULTANT(1764642515446L,"运营片区总顾问"),
ORDER_GROUP(1766387359609L,"订单组"),
;
private Long code;

41
coolstore-partner-common/src/main/java/com/cool/store/enums/opening/AcceptanceStatusEnum.java Normal file
View File

@@ -0,0 +1,41 @@
package com.cool.store.enums.opening;
/**
* @Auther zx_szh
* @Date 2025/12/22 10:29
* @Version 1.0
*/
public enum AcceptanceStatusEnum {
PENDING_ACCEPTANCE(1,"待验收"),
ACCEPTANCE_IS_UNQUALIFIED(5,"验收不合格"),
ACCEPTED(10,"已验收"),
;
AcceptanceStatusEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
private Integer code;
private String message;
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
}

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

@@ -18,7 +18,6 @@ public enum ShopSubStageEnum {
SHOP_STAGE_3(ShopStageEnum.SHOP_STAGE_2, 30, "营业执照办理", 23),
SHOP_STAGE_4(ShopStageEnum.SHOP_STAGE_2, 40, "食安许可证", 55),
SHOP_STAGE_5(ShopStageEnum.SHOP_STAGE_2, 50, "员工招聘", 23),
SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 260, "开通门店平安钱包", 1),
SHOP_STAGE_7(ShopStageEnum.SHOP_STAGE_2, 70, "缴纳加盟费/保证金", 1),
SHOP_STAGE_8(ShopStageEnum.SHOP_STAGE_2, 80, "加盟合同签约", 4),
SHOP_STAGE_8_5(ShopStageEnum.SHOP_STAGE_2, 85, "发票回传", 5),
@@ -42,6 +41,10 @@ public enum ShopSubStageEnum {
SHOP_STAGE_22(ShopStageEnum.SHOP_STAGE_3, 220, "快手", null),
SHOP_STAGE_25(ShopStageEnum.SHOP_STAGE_3, 250, "京东外卖", null),
SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 260, "开通门店平安钱包", 1),
SHOP_STAGE_27(ShopStageEnum.SHOP_STAGE_2, 270, "开业验收", 1),
;
//阶段
@@ -136,6 +139,7 @@ public enum ShopSubStageEnum {
case SHOP_STAGE_23:
case SHOP_STAGE_24:
case SHOP_STAGE_25:
case SHOP_STAGE_27:
return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
default:
return null;

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

@@ -101,6 +101,8 @@ public enum ShopSubStageStatusEnum {
//订货系统
SHOP_SUB_STAGE_STATUS_170(ShopSubStageEnum.SHOP_STAGE_17, 1700, "待【IT部】提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_171(ShopSubStageEnum.SHOP_STAGE_17, 1710, "等待培训中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_172(ShopSubStageEnum.SHOP_STAGE_17, 1720, "待授权账号", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_173(ShopSubStageEnum.SHOP_STAGE_17, 1730, "已完成", Boolean.TRUE),
//抖音
@@ -153,6 +155,12 @@ public enum ShopSubStageStatusEnum {
SHOP_SUB_STAGE_STATUS_254(ShopSubStageEnum.SHOP_STAGE_25, 2540,"开通失败", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_255(ShopSubStageEnum.SHOP_STAGE_25, 2550, "开通成功", Boolean.TRUE),
//开业验收
SHOP_SUB_STAGE_STATUS_270(ShopSubStageEnum.SHOP_STAGE_27, 2700, "待上传", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_272(ShopSubStageEnum.SHOP_STAGE_27, 2720, "待审批", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_274(ShopSubStageEnum.SHOP_STAGE_27, 2740,"待整改", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_276(ShopSubStageEnum.SHOP_STAGE_27, 2760,"已完成", Boolean.TRUE),
;
private ShopSubStageEnum shopSubStageEnum;