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

Merge #98 into master from cc_20260408_trans

Browse Source 
feat:mock 处理

* cc_20260408_trans: (22 commits squashed)

  - feat：分账

  - feat：分账接口

  - feat：分账单管理

  - feat：分账管理

  - feat：分账管理

  - feat：userIdName

  - feat：提现

  - feat：调整

  - feat：accountName

  - feat：accountName

  - feat：mock

  - feat：关联门店

  - feat：待充值待认款

  - feat：待充值待认款

  - feat：payer_account_no

  - feat：payeeAccountName

  - feat：payeeAccountNo

  - feat：page

  - feat：枚举

  - feat：接口请求方式调整get->post

  - feat:mock 处理

  - Merge branch 'master' into cc_20260408_trans
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

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/98
This commit is contained in:
正新
2026-04-14 09:55:00 +00:00
parent 9ad7fa0f5a
commit 1bbb6f7097
80 changed files with 4204 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,6 +385,10 @@ public class RedisConstant {
*/
public static final String WALLET_ALLOCATION_PAY_LOCK_KEY = "wallet_allocation_pay_lock_key:{0}";
public static final String WALLET_TRANSFER_LOCK = "wallet_transfer_lock:{0}";
public static final String WALLET_WITHDRAW_LOCK = "wallet_withdraw_lock:{0}";
/**
* 私域设备SN->绑定二维码地址
*/

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

@@ -373,16 +373,36 @@ public enum ErrorCodeEnum {
//装修
TEAM_USED(1612001,"该装修团队有门店使用，无法删除，请确认！",null),
CURRENT_BRAND_SORT_NUMBER_EXIST(16100007,"已存在该排序数字！",null),
CONTRACT_CONFIG_NOT_EXIST(16100008,"合同配置不存在！",null),
CURRENT_BRAND_SORT_NUMBER_EXIST(1612002,"已存在该排序数字！",null),
CONTRACT_CONFIG_NOT_EXIST(1612003,"合同配置不存在！",null),
WALLET_OPEN_ACCOUNT_FAIL(1620001,"钱包开通失败",null),
WALLET_WITH_DRAWER_FAIL(1620002,"提现失败",null),
WALLET_API_ERROR(1620003,"{0}",null),
MINI_PROGRAM_VERSION_TOO_LOW(1620004,"小程序版本过低，请刷新小程序再操作！",null),
CONTRACT_SIGNED(600002, "操作失败，合同签约已完成", null),
CONTRACT_SIGNED(1620006, "操作失败，合同签约已完成", null),
ZXJP_AMOUNT_INSTRUCTION_IS_BLANK(1620005, "鸡排价格不为10元，请填写原因", null),
//分账
TRANS_ID_NOT_NULL(1621001, "分账单ID不能为空！", null),
TRANS_NOT_NULL(1621002, "分账单不存在！", null),
NOT_SUPPORT_OPERATION(1621003, "当前状态不支持该操作！", null),
CHANGE_ID_NOT_NULL(1621004, "调整单ID不能为空！", null),
CHANGE_NOT_NULL(1621005, "调整单不存在！", null),
TRADE_EXIST(1621006, "部分交易流水号已被使用，请检查！", null),
NOT_COMPLETE_TRANS_SHEET(1621007, "存在关联未分账完成的分账单，请完成之后再操作！", null),
PENDING_TRANS_AMOUNT(1621008, "分账金额不能大于待分账金额！", null),
TRANSFER_ERROR(1621009, "分账异常！", null),
TRANSFER_ING(1621010, "分账中，请勿重复分账！", null),
WITHDRAW_APPLY_NOT_EXIST(1621011, "提现申请单不存在！", null),
WITHDRAW_ING(1621012, "提现中，请勿重复分账！", null),
// 171闭店
CLOSE_STORE_SUB_STAGE_ERROR(171002, "当前流程状态异常", null),
STORE_NOT_EXIST(1710003,"门店不存在！",null),
@@ -454,8 +474,10 @@ public enum ErrorCodeEnum {
WALLET_RE_PAY_FAIL(1830019, "重新支付异常，请联系管理员", null),
WALLET_PAY_CANNOT_CANCEL(1830020, "该交易无法取消", null),
TOTAL_FEES_NEED_EQUAL(1830021, "分账总金额需与合计缴费金额一致", null),
NOT_EXIST_WANG_SHANG_ACCOUNT(1830022, "当前门店未开通网商钱包账户，请先开通！", null),
IP_LIMIT(1840000, "IP访问次数超限", null),
;

41
coolstore-partner-common/src/main/java/com/cool/store/enums/ExpenseSheetTypeEnum.java Normal file
View File

@@ -0,0 +1,41 @@
package com.cool.store.enums;
/**
* 费用单类型枚举
*/
public enum ExpenseSheetTypeEnum {
EXPENSE_SHEET(1, "费用单"),
ADJUSTMENT_SHEET(2, "调整单");
private final Integer code;
private final String desc;
ExpenseSheetTypeEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
public Integer getCode() {
return code;
}
public String getDesc() {
return desc;
}
/**
* 根据code获取枚举
*/
public static ExpenseSheetTypeEnum getByCode(Integer code) {
if (code == null) {
return null;
}
for (ExpenseSheetTypeEnum typeEnum : values()) {
if (typeEnum.getCode().equals(code)) {
return typeEnum;
}
}
return null;
}
}

31
coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WithdrawStatusEnum.java Normal file
View File

@@ -0,0 +1,31 @@
package com.cool.store.enums.fees;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 提现状态枚举类
*/
@Getter
@AllArgsConstructor
public enum WithdrawStatusEnum {
PAID(1, "已分账"),
FAIL(2, "分账失败"),
PAYING(3, "分账中"),
PENDING(5, "待分账"),
;
private final Integer status;
private final String desc;
public static String getDescByStatus(Integer status) {
for (WithdrawStatusEnum value : values()) {
if (value.status.equals(status)) {
return value.desc;
}
}
return "";
}
}

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

@@ -0,0 +1,37 @@
package com.cool.store.enums.wallet;
/**
* @Auther zx_szh
* @Date 2026/4/9 09:35
* @Version 1.0
*/
public enum DocStatusEnum {
//10-待充值/20-已充值待认款/30-认款完成/40-分部分账/50-分账完成
DOC_STATUS_1(10,"待充值"),
DOC_STATUS_2(20,"已充值待认款"),
DOC_STATUS_3(30,"认款完成"),
DOC_STATUS_4(40,"部分分账"),
DOC_STATUS_5(50,"分账完成"),
;
private final Integer status;
private final String desc;
DocStatusEnum(Integer status, String desc) {
this.status = status;
this.desc = desc;
}
public Integer getStatus() {
return status;
}
public String getDesc() {
return desc;
}
}

47
coolstore-partner-common/src/main/java/com/cool/store/enums/wallet/SplitSourceEnum.java Normal file
View File

@@ -0,0 +1,47 @@
package com.cool.store.enums.wallet;
import com.cool.store.enums.ExpenseSheetTypeEnum;
/**
* @Auther zx_szh
* @Date 2026/4/8 16:56
* @Version 1.0
*/
public enum SplitSourceEnum {
//1-手工新增/2-费用调整单/3-费用单
ADD_BY_HAND(1,"手工新增"),
FEE_ADJUSTMENT_ORDER(2,"费用调整单"),
EXPENSE_LIST(3,"费用单")
;
private final Integer status;
private final String desc;
SplitSourceEnum(Integer status, String desc) {
this.status = status;
this.desc = desc;
}
public static SplitSourceEnum getSplitSourceEnum(Integer expenseSheetType){
if (ExpenseSheetTypeEnum.ADJUSTMENT_SHEET.getCode().equals(expenseSheetType)){
return FEE_ADJUSTMENT_ORDER;
}
if (ExpenseSheetTypeEnum.EXPENSE_SHEET.getCode().equals(expenseSheetType)){
return EXPENSE_LIST;
}
return null;
}
public Integer getStatus() {
return status;
}
public String getDesc() {
return desc;
}
}

38
coolstore-partner-common/src/main/java/com/cool/store/enums/wallet/SplitTypeEnum.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.enums.wallet;
import com.cool.store.enums.ExpenseSheetTypeEnum;
/**
* @Auther zx_szh
* @Date 2026/4/9 19:01
* @Version 1.0
*/
public enum SplitTypeEnum {
//（1-门店付款/2-门店收款/3-公司间结算）
ADD_BY_HAND(1,"门店付款"),
FEE_ADJUSTMENT_ORDER(2,"门店收款"),
EXPENSE_LIST(3,"公司间结算")
;
private final Integer status;
private final String desc;
SplitTypeEnum(Integer status, String desc) {
this.status = status;
this.desc = desc;
}
public Integer getStatus() {
return status;
}
public String getDesc() {
return desc;
}
}

34
coolstore-partner-common/src/main/java/com/cool/store/enums/wallet/TradeTypeEnum.java Normal file
View File

@@ -0,0 +1,34 @@
package com.cool.store.enums.wallet;
/**
* @Auther zx_szh
* @Date 2026/4/13 09:54
* @Version 1.0
* @desc 交易类型 1-转账 2-提现
*/
public enum TradeTypeEnum {
ADD_BY_HAND(1,"转账"),
FEE_ADJUSTMENT_ORDER(2,"提现"),
;
private final Integer status;
private final String desc;
TradeTypeEnum(Integer status, String desc) {
this.status = status;
this.desc = desc;
}
public Integer getStatus() {
return status;
}
public String getDesc() {
return desc;
}
}

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

@@ -17,6 +17,7 @@ public enum WalletTradeModuleEnum {
FRANCHISE_PAY("FRANCHISE_PAY", "钱包加盟缴费"),
STANDARD_STORE("STANDARD_STORE", "标准店缴费"),
TRANSFER("TRANSFER", "分账管理"),
;
private final String module;

28
coolstore-partner-common/src/main/java/com/cool/store/utils/GenerateNoUtil.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.utils;
import com.cool.store.enums.ExpenseSheetTypeEnum;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -15,6 +17,11 @@ import static com.cool.store.utils.CoolDateUtils.DATE_FORMAT_SEC_9;
*/
public class GenerateNoUtil {
private static final String ADJUSTMENT_ORDER_PREFIX = "TZ";
private static final String EXPENSE_SHEET_PREFIX = "FY";
private static final String SPLIT_ORDER_PREFIX = "FZ";
/**
* 生成编号，yyyyMMddHHmmssSSS+3位随机数
*/
@@ -22,4 +29,25 @@ public class GenerateNoUtil {
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT_SEC_9);
return LocalDateTime.now().format(dateFormatter) + ((int) (Math.random() * 900) + 100);
}
/**
* 单号
* @param prefix
* @return
*/
public static String generateNo(String prefix) {
return prefix + GenerateNoUtil.generateMillsNoWithRandom();
}
public static String generateAdjustmentNo(Integer expenseSheetType) {
if (ExpenseSheetTypeEnum.ADJUSTMENT_SHEET.getCode().equals(expenseSheetType)){
return ADJUSTMENT_ORDER_PREFIX + GenerateNoUtil.generateMillsNoWithRandom();
}
return EXPENSE_SHEET_PREFIX + GenerateNoUtil.generateMillsNoWithRandom();
}
public static String generateSplitNo() {
return SPLIT_ORDER_PREFIX + GenerateNoUtil.generateMillsNoWithRandom();
}
}