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

feat:费用类型

Browse Source
This commit is contained in:
suzhuhong
2026-04-21 17:28:34 +08:00
parent acd1323afa
commit 7c64c5d3d5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ public enum WalletFeeItemEnum {
DEVICE_EARNEST_MONEY(320, "expense_device_earnest_money", "设备保证金"), DEVICE_EARNEST_MONEY(320, "expense_device_earnest_money", "设备保证金"),
EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"), EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"),
EXPENSE_EQUIPMENT_MONEY(317, "expense_equipment_money", "设备费"), EXPENSE_EQUIPMENT_MONEY(317, "expense_equipment_money", "设备费"),
FIRST_ORDER(321, "expense_first_order_money", "首批订货"),
; ;
private final Integer feeItemId; private final Integer feeItemId;

2
coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java
View File

@@ -754,7 +754,7 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic
}catch (Exception e){ }catch (Exception e){
//分账失败 释放锁 //分账失败 释放锁
redisUtil.unlock(lockKey); redisUtil.unlock(lockKey);
log.error("confirmSplitOrder:{}",e.getMessage()); log.error("confirmSplitOrder ",e);
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE,e.getMessage()); throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE,e.getMessage());
} }
record.setAllocationStatus(AllocationPayStatusEnum.PAYING.getStatus()); record.setAllocationStatus(AllocationPayStatusEnum.PAYING.getStatus());