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:
张松
2025-10-31 13:36:29 +08:00
parent f40a6b9e8e 35bc20c77e
commit 7996129a7c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,7 +347,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
.eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId()) .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId())
.le(MkDistributionLevelConfig::getCostAmount, totalAmount) .le(MkDistributionLevelConfig::getCostAmount, totalAmount)
.gt(MkDistributionLevelConfig::getId, distributionUser.getDistributionLevelId()) .gt(MkDistributionLevelConfig::getId, distributionUser.getDistributionLevelId())
.orderBy(MkDistributionLevelConfig::getId).asc().limit(1)); .orderBy(MkDistributionLevelConfig::getId).desc().limit(1));
MkDistributionUser newDistributionUser = new MkDistributionUser(); MkDistributionUser newDistributionUser = new MkDistributionUser();
newDistributionUser.setId(shopUserId); newDistributionUser.setId(shopUserId);
newDistributionUser.setConsumeAmount(totalAmount); newDistributionUser.setConsumeAmount(totalAmount);
@@ -473,7 +473,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
newDistributionUser.setDistributionLevelId(distributionUser.getDistributionLevelId()); newDistributionUser.setDistributionLevelId(distributionUser.getDistributionLevelId());
newDistributionUser.setDistributionLevelName(distributionUser.getDistributionLevelName()); newDistributionUser.setDistributionLevelName(distributionUser.getDistributionLevelName());
newDistributionUser.setConsumeAmount(distributionUser.getConsumeAmount()); newDistributionUser.setConsumeAmount(distributionUser.getConsumeAmount());
updateById(distributionUser); updateById(newDistributionUser);
} }
@@ -508,6 +508,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
distributionUser.setDistributionLevelId(0L); distributionUser.setDistributionLevelId(0L);
distributionUser.setDistributionLevelName("无等级"); distributionUser.setDistributionLevelName("无等级");
} }
distributionUser.setIsAssignLevel(0);
} }
@Override @Override