czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
This commit is contained in:
wangw
2025-10-30 13:46:09 +08:00
parent e15c58fc32 d96e4f304d
commit a4a0f7b2d9
11 changed files with 105 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionFlow.java
View File

@@ -112,4 +112,5 @@ public class MkDistributionFlow implements Serializable {
private BigDecimal commission;
private BigDecimal parentCommission;
private LocalDateTime deliverTime;
}

8
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java
View File

@@ -102,17 +102,19 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
/**
* 分销员开通
*
* @param userId 用户
* @param shopUserId 用户
* @param amount 金额
* @param shopId 店铺id
*/
void open(Long userId, BigDecimal amount, Long shopId, Long sourceId);
void open(Long shopUserId, BigDecimal amount, Long shopId, Long sourceId);
/**
* 分销商户运营余额充值回调
*/
void rechargeCallBack(Long shopId, BigDecimal amount, Long paymentId);
BigDecimal updateShopInfoAmount(Long shopId, BigDecimal changeAmount, Long sourceId);
/**
* 发放分销奖励
*
@@ -122,7 +124,7 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
* @param userId 用户id
* @param shopId 店铺id
*/
void distribute(Long sourceId, String orderNo, BigDecimal amount, Long userId, Long shopId, String type, boolean isTask);
void distribute(Long sourceId, String orderNo, BigDecimal amount, Long userId, Long shopId, String type);
void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId, Long shopId, Integer isOne);

1
cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java
View File

@@ -85,6 +85,7 @@ public interface TableValueConstant {
enum Status {
PENDING("pending", "待入账"),
SUCCESS("success", "已入账"),
REFUND("REFUND", "已退款"),
FAIL("fail", "失败");
private final String code;
private final String msg;