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

Merge #81 into master from cc_20260320_standard_expense_Type

Browse Source 
feat：时间调整

* cc_20260320_standard_expense_Type: (40 commits squashed)

  - feat：费用类型新增

  - feat：费用类型

  - feat：默认数据

  - feat：类型调整

  - Merge branch 'master' into cc_20260320_standard_expense_Type

  - feat：逻辑调整

  - Merge branch 'master' into cc_20260320_standard_expense_Type

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：查询预分账调整

  - feat：查询预分账调整

  - feat：心愿单 校验调整

  - feat：心愿单 校验调整

  - feat：心愿单 金额校验调整

  - feat：心愿单 金额校验调整

  - feat：心愿单 金额校验调整

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送 优化推送 当系统使用费为零的时候 推送数据重置的问题

  - Merge branch 'master' into cc_20260320_standard_expense_Type

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：数据调整

  - feat：新增系统服务费

  - feat：新增系统服务费 319

  - feat：新增系统服务费 319

  - feat：新增系统服务费 319

  - 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/81
This commit is contained in:
正新
2026-03-30 13:20:15 +00:00
parent d03bdb7cb0
commit 310ae0be7d
50 changed files with 1606 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,6 +361,11 @@ public enum ErrorCodeEnum {
DUPLICATE_PAYMENTS(1610108, "订单支付中，请勿重复支付！", null),
CURRENT_ORDER_NOT_SUPPORT(1610109, "当前订单状态不支持审批！", null),
CURRENT_POINT_BIND_OTHER_WISHLIST(1610110, "当前铺位绑定了其他心愿单！", null),
CURRENT_ORDER_STATUS_NOT_SUPPORT_CHANGE(1610111, "当前订单状态不支持变换心愿单！", null),
CURRENT_WISHLIST_BIND_OTHER_POINT(1610112, "当前心愿单绑定了其他铺位！", null),
ORDER_DATA_EXCEPTION(1610113, "心愿单数据异常！", null),
CURRENT_WISHLIST_NOT_EXIST(1610112, "当前心愿单不存在！", null),

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

@@ -16,7 +16,7 @@ import lombok.Getter;
public enum PayTypeEnum {
OFFLINE(1, "线下支付"),
PING_AN(2, "平安钱包支付"),
PING_AN(2, "网商钱包支付"),
;
private final Integer type;

43
coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java
View File

@@ -1,8 +1,15 @@
package com.cool.store.enums.fees;
import com.cool.store.enums.point.ShopSubStageEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static com.cool.store.enums.point.ShopSubStageEnum.SHOP_STAGE_28;
/**
* <p>
* 钱包转账费用科目枚举类
@@ -18,6 +25,7 @@ public enum WalletFeeItemEnum {
MANAGEMENT_FEE(311, "expense_management_fee", "管理费（年）"),
BRAND_USAGE_FEE(312, "expense_brand_usage_fee", "品牌使用费（年）"),
DESIGN_FEE_GROUP(313, "expense_design_fee_group", "设计费-集团"),
SYSTEM_SERVICE_FEE(319,"expense_system_service_money","系统服务费（年）"),
// DESIGN_FEE_LG(314, "expense_design_fee_lg", "设计费-立规"),
EARNEST_MONEY(315, "expense_earnest_money", "保证金"),
EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"),
@@ -39,6 +47,19 @@ public enum WalletFeeItemEnum {
return null;
}
public static String getByExpenseTypeName(String expenseType) {
for (WalletFeeItemEnum value : WalletFeeItemEnum.values()) {
if (value.expenseType.equals(expenseType)) {
return value.getDesc();
}
}
return null;
}
public static List<WalletFeeItemEnum> getBaseExpenseType(){
return Arrays.asList(FRANCHISE_FEE,MANAGEMENT_FEE,BRAND_USAGE_FEE,DESIGN_FEE_GROUP,EARNEST_MONEY,SYSTEM_SERVICE_FEE);
}
public static WalletFeeItemEnum getByFeeItemId(Integer feeItemId) {
for (WalletFeeItemEnum value : WalletFeeItemEnum.values()) {
if (value.feeItemId.equals(feeItemId)) {
@@ -47,4 +68,26 @@ public enum WalletFeeItemEnum {
}
return null;
}
public static List<String> getWalletFeeItemBySubStage(Integer subStage){
ShopSubStageEnum subStageEnum = ShopSubStageEnum.getByShopSubStage(subStage);
if (subStageEnum==null){
return null;
}
switch (subStageEnum){
case SHOP_STAGE_28:
return Arrays.asList(
FRANCHISE_FEE.getExpenseType(),
MANAGEMENT_FEE.getExpenseType(),
BRAND_USAGE_FEE.getExpenseType(),
DESIGN_FEE_GROUP.getExpenseType(),
EARNEST_MONEY.getExpenseType());
case SHOP_STAGE_27:
return Arrays.asList(EXPENSE_DECORATION_MONEY.getExpenseType(),
EXPENSE_EQUIPMENT_MONEY.getExpenseType());
default:
return null;
}
}
}

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

@@ -12,10 +12,11 @@ public enum StoreOrderStatusEnum {
DRAFT(0, "草稿"),
WAIT_CONFIRM(5, "待立规确认"),
INVEST_MANAGER_CONFIRM(7, "待招商经理确认"),
FINANCIAL_CONFIRM(8, "待财务确认"),
INVEST_MANAGER_CONFIRM(7, "待加盟商确认"),
FINANCIAL_CONFIRM(8, "待内勤确认"),
WAIT_ADJUST(10, "待调整"),
WAIT_PAY(15, "待支付"),
PART_OF_WAIT_PAY(17, "部分支付"),
PAID(20, "已支付"),
PAY_FAIL(22, "支付失败"),
CLOSED(25, "已关闭");

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

@@ -168,11 +168,12 @@ 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(ShopSubStageEnum.SHOP_STAGE_28, 2810, "待立规确认", 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_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),
SHOP_SUB_STAGE_STATUS_284_5(ShopSubStageEnum.SHOP_STAGE_28, 2845, "对账中", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_285(ShopSubStageEnum.SHOP_STAGE_28, 2850, "已完成", Boolean.TRUE),