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

Merge #71 into master from cc_20260318_wishlist

Browse Source 
feat：订单待确认 审批流去掉

* cc_20260318_wishlist: (22 commits squashed)

  - feat：心愿单接口

  - feat：心愿单接口

  - feat：心愿单接口

  - feat：心愿单接口 查询当前门店铺位绑定的心愿单

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

  - feat：心愿单接口 状态

  - Merge branch 'master' into cc_20260318_wishlist

  - feat：代码merge 错误处理

  - feat：新增storeType

  - feat：查询逻辑调整

  - feat：新增use_ai 赛选

  - feat：新增use_ai 赛选

  - feat：新增use_ai 赛选

  - feat：心愿单状态筛选

  - feat：查询当前门店铺位绑定的心愿单 mini

  - feat：bug修复

  - feat：类型调整

  - feat：名称

  - feat：订单待确认 审批流去掉

  - 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/71
This commit is contained in:
正新
2026-03-23 11:51:20 +00:00
parent d50a31d044
commit a13ba2175c
38 changed files with 908 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,6 +360,7 @@ public enum ErrorCodeEnum {
PAY_FAIL(1610107, "支付失败", null),
DUPLICATE_PAYMENTS(1610108, "订单支付中，请勿重复支付！", null),
CURRENT_ORDER_NOT_SUPPORT(1610109, "当前订单状态不支持审批！", null),
CURRENT_POINT_BIND_OTHER_WISHLIST(1610110, "当前铺位绑定了其他心愿单！", null),

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

@@ -75,6 +75,7 @@ public enum UserRoleEnum {
INVESTMENT_MANGER(1765266125369L, "招商经理"),
OPERATION_GENERAL_CONSULTANT(1764642515446L,"运营片区总顾问"),
ORDER_GROUP(1766387359609L,"订单组"),
AI_STORE_TYPE_APPROVE(1774252055402L,"AI店型订单审核"),
;
private Long code;

45
coolstore-partner-common/src/main/java/com/cool/store/enums/order/WishlistStatusEnum.java Normal file
View File

@@ -0,0 +1,45 @@
package com.cool.store.enums.order;
import java.util.Arrays;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @Auther zx_szh
* @Date 2026/3/18 14:24
* @Version 1.0
*/
public enum WishlistStatusEnum {
AGREE(0, "待完善加盟资质"),
COMPLETE_POINT(5, "待绑定铺位"),
LI_GUI_APPROVE(10, "待立规审核"),
PASS(20, "通过"),
REJECT(15, "拒绝"),
;
private final Integer code;
private final String desc;
WishlistStatusEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
public Integer getCode() {
return code;
}
public String getDesc() {
return desc;
}
private static final Map<Integer, WishlistStatusEnum> MAP = Arrays.stream(values())
.collect(Collectors.toMap(WishlistStatusEnum::getCode, Function.identity(), (a, b) -> a));
public static WishlistStatusEnum of(Integer code) {
return MAP.get(code);
}
}

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

@@ -169,7 +169,7 @@ public enum ShopSubStageStatusEnum {
SHOP_SUB_STAGE_STATUS_280(ShopSubStageEnum.SHOP_STAGE_28, 2800, "待选购", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_281(ShopSubStageEnum.SHOP_STAGE_28, 2810, "待立规审批", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_281_5(ShopSubStageEnum.SHOP_STAGE_28, 2815, "待招商经理审批", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_281_5(ShopSubStageEnum.SHOP_STAGE_28, 2815, "待加盟商确认", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_282(ShopSubStageEnum.SHOP_STAGE_28, 2820, "待财务确认", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_283(ShopSubStageEnum.SHOP_STAGE_28, 2830, "审批拒绝", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_284(ShopSubStageEnum.SHOP_STAGE_28, 2840, "待缴费", Boolean.FALSE),