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-29 15:07:49 +08:00
parent 98db120f1f bd36913fdc
commit 29e15b5ad5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,8 +83,8 @@ public interface TableValueConstant {
@Getter @Getter
enum Status { enum Status {
PENDING("pending", "待入账"), PENDING("pending", "待入账"),
SUCCESS("sub", "已入账"), SUCCESS("success", "已入账"),
SELF_RECHARGE("self_recharge", "自助充值"), FAIL("fail", "失败"); FAIL("fail", "失败");
private final String code; private final String code;
private final String msg; private final String msg;

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

@@ -592,16 +592,17 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
} catch (Exception e) { } catch (Exception e) {
flag = false; flag = false;
} }
ShopUser shopUser = shopUserService.getById(distributionUser.getId());
MkDistributionFlow mkDistributionFlow = new MkDistributionFlow().setShopUserId(distributionUser.getId()) MkDistributionFlow mkDistributionFlow = new MkDistributionFlow().setShopUserId(distributionUser.getId())
.setShopId(distributionUser.getShopId()).setDistributionUserId(distributionUser.getId()) .setShopId(distributionUser.getShopId()).setDistributionUserId(distributionUser.getId())
.setNickName(shopUser.getNickName())
.setLevelId(distributionUser.getDistributionLevelId()).setLevel(currentLevel == 1 ? 1 : 2).setSourceNickName(sourceShopUser.getNickName()).setOrderNo(orderNo) .setLevelId(distributionUser.getDistributionLevelId()).setLevel(currentLevel == 1 ? 1 : 2).setSourceNickName(sourceShopUser.getNickName()).setOrderNo(orderNo)
.setSourceId(sourceId).setAmount(amount).setType(type).setStatus(flag ? TableValueConstant.DistributionFlow.Status.SUCCESS.getCode() : .setSourceId(sourceId).setAmount(amount).setType(type).setStatus(flag ? TableValueConstant.DistributionFlow.Status.SUCCESS.getCode() :
TableValueConstant.DistributionFlow.Status.PENDING.getCode()) TableValueConstant.DistributionFlow.Status.PENDING.getCode())
.setRewardAmount(rewardAmount).setBillNo(IdUtil.simpleUUID()); .setRewardAmount(rewardAmount).setBillNo(IdUtil.simpleUUID());
distributionFlowService.save(mkDistributionFlow); distributionFlowService.save(mkDistributionFlow);
ShopUser shopUser = shopUserService.getById(distributionUser.getId());
updateIncome(!flag ? rewardAmount : BigDecimal.ZERO, updateIncome(!flag ? rewardAmount : BigDecimal.ZERO,
flag ? rewardAmount : BigDecimal.ZERO, BigDecimal.ZERO, distributionUser.getId(), shopUser.getUserId()); flag ? rewardAmount : BigDecimal.ZERO, BigDecimal.ZERO, distributionUser.getId(), shopUser.getUserId());