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

Merge #90 into master from cc_20260407_bzj

Browse Source 
feat：时间处理

* cc_20260407_bzj: (3 commits squashed)

  - 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/90
This commit is contained in:
正新
2026-04-08 11:41:54 +00:00
parent 68cef4b83a
commit 77ca18b6fc
13 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,8 @@ public enum WalletFeeItemEnum {
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", "保证金"),
EARNEST_MONEY(315, "expense_earnest_money", "加盟保证金"),
DEVICE_EARNEST_MONEY(320, "expense_device_earnest_money", "设备保证金"),
EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"),
EXPENSE_EQUIPMENT_MONEY(317, "expense_equipment_money", "设备费"),
;
@@ -57,7 +58,7 @@ public enum WalletFeeItemEnum {
}
public static List<WalletFeeItemEnum> getBaseExpenseType(){
return Arrays.asList(FRANCHISE_FEE,MANAGEMENT_FEE,BRAND_USAGE_FEE,DESIGN_FEE_GROUP,EARNEST_MONEY,SYSTEM_SERVICE_FEE);
return Arrays.asList(FRANCHISE_FEE,MANAGEMENT_FEE,BRAND_USAGE_FEE,DESIGN_FEE_GROUP,EARNEST_MONEY,SYSTEM_SERVICE_FEE,DEVICE_EARNEST_MONEY);
}
public static WalletFeeItemEnum getByFeeItemId(Integer feeItemId) {
@@ -82,7 +83,8 @@ public enum WalletFeeItemEnum {
MANAGEMENT_FEE.getExpenseType(),
BRAND_USAGE_FEE.getExpenseType(),
DESIGN_FEE_GROUP.getExpenseType(),
EARNEST_MONEY.getExpenseType());
EARNEST_MONEY.getExpenseType(),
DEVICE_EARNEST_MONEY.getExpenseType());
case SHOP_STAGE_27:
return Arrays.asList(EXPENSE_DECORATION_MONEY.getExpenseType(),
EXPENSE_EQUIPMENT_MONEY.getExpenseType());