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

Merge #136 into master from cc_20260508_adjustment

Browse Source 
feat:费用单费用调整单合并

* cc_20260508_adjustment: (20 commits squashed)

  - feat:费用单调整

  - feat:费用调整

  - feat:新增审批

  - feat:费用调整单

  - feat:调整单

  - feat:自动分账

  - feat:填写添加门店

  - feat:流水查询条件

  - Merge branch 'master' into cc_20260508_adjustment

  - feat：费用流水筛选条件

  - feat：getAdjustAmount

  - feat:提现申请单导出

  - feat:提现申请单导出 状态

  - feat:提现申请单导出 状态

  - Merge branch 'cc_20260513_withdrawApplication_export' into cc_20260508_adjustment
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithdrawApplicationDTO.java

  - feat:提现申请单导出 状态

  - 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/136
This commit is contained in:
正新
2026-05-13 08:50:21 +00:00
parent a2648eaed4
commit 150b709b74
30 changed files with 489 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
View File

@@ -395,6 +395,11 @@ public class RedisConstant {
*/
public static final String SPLIT_ORDER_EXPORT_LOCK = "split_order_export_lock";
/**
* 提现申请导出锁
*/
public static final String WITHDRAW_APPLICATION_EXPORT_LOCK = "withdraw_application_export_lock";
/**
* 钱包分账公司配置-招商分部
*/

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

@@ -399,6 +399,7 @@ public enum ErrorCodeEnum {
WITHDRAW_APPLY_NOT_EXIST(1621011, "提现申请单不存在！", null),
WITHDRAW_ING(1621012, "提现中，请勿重复分账！", null),
WALLET_BALANCE_INSUFFICIENT(1621013, "钱包余额不足!", null),
WALLET_OPEN_ACCOUNT_NO_BALANCE(1621014,"认款失败，该门店钱包余额不足！",null),

3
coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
View File

@@ -35,9 +35,10 @@ public enum FileTypeEnum {
MY_POINT_EXPORT("myPointExport", "我的铺位管理列表"),
ORDER_DEVICE_DETAIL_EXPORT("orderDeviceDetailExport", "订单设备明细导出"),
TP_SCORE_JOURNAL_EXPORT("tpScoreJournalExport", "十二分制积分流水导出"),
ADJUSTMENT_ORDER_EXPORT("adjustmentOrderExport", "费用调整单导出"),
ADJUSTMENT_ORDER_EXPORT("adjustmentOrderExport", "费用单据导出"),
EXPENSE_ORDER_EXPORT("expenseOrderExport", "费用单导出"),
SPLIT_ORDER_EXPORT("splitOrderExport", "分账单导出"),
WITHDRAW_APPLICATION_EXPORT("withdrawApplicationExport", "提现申请导出"),
;
private String fileType;
private String desc;

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

@@ -3,6 +3,10 @@ package com.cool.store.enums.fees;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
* 平安钱包缴费转账状态枚举类
@@ -15,17 +19,23 @@ import lombok.Getter;
@AllArgsConstructor
public enum AllocationPayStatusEnum {
PAID(1, "已支付"),
FAIL(2, "支付失败"),
PAYING(3, "支付中"),
CANCEL(4, "已取消"),
UNPAID(5, "未支付"),
PAID(1, "已支付","提现成功"),
FAIL(2, "支付失败","提现失败"),
PAYING(3, "支付中","提现中"),
CANCEL(4, "已取消","已取消"),
UNPAID(5, "未支付","未提现"),
;
private final Integer status;
private final String desc;
private final String otherDesc;
public static List<Integer> getAllStatus(){
return Arrays.stream(AllocationPayStatusEnum.values()).map(AllocationPayStatusEnum::getStatus).collect(Collectors.toList());
}
public static String getDescByStatus(Integer status) {
for (AllocationPayStatusEnum value : values()) {
if (value.status.equals(status)) {
@@ -34,4 +44,13 @@ public enum AllocationPayStatusEnum {
}
return "";
}
public static String getOtherDescByStatus(Integer status) {
for (AllocationPayStatusEnum value : values()) {
if (value.status.equals(status)) {
return value.otherDesc;
}
}
return "";
}
}

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

@@ -1,5 +1,8 @@
package com.cool.store.enums.wallet;
import java.util.Arrays;
import java.util.List;
/**
* @Auther zx_szh
* @Date 2026/4/9 09:35
@@ -8,7 +11,9 @@ package com.cool.store.enums.wallet;
public enum DocStatusEnum {
//10-待充值/20-已充值待认款/30-认款完成/40-分部分账/50-分账完成
DOC_STATUS_05(5,"待审批"),
DOC_STATUS_1(10,"待充值"),
DOC_STATUS_15(15,"审批未通过"),
DOC_STATUS_2(20,"已充值待认款"),
DOC_STATUS_3(30,"认款完成"),
DOC_STATUS_4(40,"部分分账"),
@@ -32,6 +37,9 @@ public enum DocStatusEnum {
return desc;
}
public static List<Integer> getCanDeleteStatus(){
return Arrays.asList(DOC_STATUS_05.getStatus(),DOC_STATUS_1.getStatus(),DOC_STATUS_2.getStatus());
}
public static DocStatusEnum fromStatus(Integer status) {
for (DocStatusEnum item : values()) {