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
This commit is contained in:
wangw
2025-10-30 16:54:02 +08:00
parent 2e10fbe7b9 d7552d47b9
commit 9b8f5d26da
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
View File

@@ -539,7 +539,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
} }
private void deepReward(ShopUser orderSourceShopUser, MkDistributionLevelConfig parentLevel, MkDistributionConfigVO config, MkDistributionUser currentDistributionUser, BigDecimal amount, Long sourceId, String type, String orderNo, Integer currentLevel) { @Transactional(rollbackFor = Exception.class)
protected void deepReward(ShopUser orderSourceShopUser, MkDistributionLevelConfig parentLevel, MkDistributionConfigVO config, MkDistributionUser currentDistributionUser, BigDecimal amount, Long sourceId, String type, String orderNo, Integer currentLevel) {
if (currentLevel > 2) { if (currentLevel > 2) {
return; return;
} }
@@ -615,6 +616,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
distributionFlowService.updateById(mkDistributionFlow); distributionFlowService.updateById(mkDistributionFlow);
} }
}else { }else {
mkDistributionFlow.setDeliverTime(delayTime);
mkDistributionFlow.setStatus(TableValueConstant.DistributionFlow.Status.PENDING.getCode()); mkDistributionFlow.setStatus(TableValueConstant.DistributionFlow.Status.PENDING.getCode());
distributionFlowService.save(mkDistributionFlow); distributionFlowService.save(mkDistributionFlow);
log.info("延时分销开始"); log.info("延时分销开始");