Merge #109 into master from cc_20260420_export

feat:数量不一致

* cc_20260420_export: (7 commits squashed)

  - feat:提示修改

  - feat:提示修改

  - feat:导出调整

  - feat:管理员查询所有 非管理员权限查询

  - feat:管理员查询所有 非管理员权限查询

  - feat:fix

  - 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/109
This commit is contained in:
正新
2026-04-24 09:44:31 +00:00
parent d885635728
commit 7c5a2c858d
28 changed files with 756 additions and 69 deletions

View File

@@ -380,6 +380,21 @@ public class RedisConstant {
*/
public static final String TP_SCORE_JOURNAL_EXPORT_LOCK = "tp_score_journal_export_lock";
/**
* 费用调整单导出锁
*/
public static final String ADJUSTMENT_ORDER_EXPORT_LOCK = "adjustment_order_export_lock";
/**
* 费用单导出锁
*/
public static final String EXPENSE_ORDER_EXPORT_LOCK = "expense_order_export_lock";
/**
* 分账单导出锁
*/
public static final String SPLIT_ORDER_EXPORT_LOCK = "split_order_export_lock";
/**
* 钱包分账公司配置-招商分部
*/

View File

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

View File

@@ -0,0 +1,40 @@
package com.cool.store.enums.wallet;
/**
* @Auther zx_szh
* @Date 2026/4/20 20:31
* @Version 1.0
*/
public enum AdjustTypeEnum {
ADJUST_TYPE_1(1,"调增"),
ADJUST_NAME_2(2,"调减"),
;
private final Integer code;
private final String desc;
AdjustTypeEnum(Integer status, String desc) {
this.code = status;
this.desc = desc;
}
public Integer getCode() {
return code;
}
public String getDesc() {
return desc;
}
public static AdjustTypeEnum fromCode(Integer code) {
for (AdjustTypeEnum item : values()) {
if (item.code.equals(code)) {
return item;
}
}
return null;
}
}

View File

@@ -33,5 +33,14 @@ public enum DocStatusEnum {
}
public static DocStatusEnum fromStatus(Integer status) {
for (DocStatusEnum item : values()) {
if (item.status.equals(status)) {
return item;
}
}
return null;
}
}

View File

@@ -35,6 +35,14 @@ public enum SplitSourceEnum {
return null;
}
public static SplitSourceEnum fromStatus(Integer status) {
for (SplitSourceEnum item : values()) {
if (item.status.equals(status)) {
return item;
}
}
return null;
}
public Integer getStatus() {

View File

@@ -1,6 +1,5 @@
package com.cool.store.enums.wallet;
import com.cool.store.enums.ExpenseSheetTypeEnum;
/**
* @Auther zx_szh
@@ -27,6 +26,15 @@ public enum SplitTypeEnum {
}
public static SplitTypeEnum fromStatus(Integer status) {
for (SplitTypeEnum item : values()) {
if (item.status.equals(status)) {
return item;
}
}
return null;
}
public Integer getStatus() {
return status;