分销员

This commit is contained in:
wangw 2025-10-28 09:26:44 +08:00
parent 94fd4fc34d
commit da7ddb8128
1 changed files with 15 additions and 12 deletions

View File

@ -166,30 +166,33 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
.eq(MkDistributionUser::getShopUserId, shopUser.getId()).eq(MkDistributionUser::getShopId, shopId)); .eq(MkDistributionUser::getShopUserId, shopUser.getId()).eq(MkDistributionUser::getShopId, shopId));
MkDistributionConfigVO mkDistributionConfigVO = mkDistributionConfigService.detail(shopId); MkDistributionConfigVO mkDistributionConfigVO = mkDistributionConfigService.detail(shopId);
if (mkDistributionUser != null) { if (mkDistributionUser != null) {
result.put("inviteCode", mkDistributionUser.getInviteCode()); Map<String, Object> distributionUser = new HashMap<>();
result.put("status", mkDistributionUser.getStatus() == 9); distributionUser.put("distributionId", mkDistributionUser.getId());
result.put("totalIncome", mkDistributionUser.getTotalIncome()); distributionUser.put("inviteCode", mkDistributionUser.getInviteCode());
result.put("pendingIncome", mkDistributionUser.getPendingIncome()); distributionUser.put("status", mkDistributionUser.getStatus() == 9);
distributionUser.put("totalIncome", mkDistributionUser.getTotalIncome());
distributionUser.put("pendingIncome", mkDistributionUser.getPendingIncome());
if (mkDistributionUser.getDistributionLevelId() != null) { if (mkDistributionUser.getDistributionLevelId() != null) {
List<MkDistributionLevelConfig> levelConfigList = mkDistributionConfigVO.getLevelConfigList(); List<MkDistributionLevelConfig> levelConfigList = mkDistributionConfigVO.getLevelConfigList();
boolean isNextLevel = false; boolean isNextLevel = false;
for (MkDistributionLevelConfig levelConfig : levelConfigList) { for (MkDistributionLevelConfig levelConfig : levelConfigList) {
if ("invite".equals(mkDistributionConfigVO.getUpgradeType()) && isNextLevel) { if ("invite".equals(mkDistributionConfigVO.getUpgradeType()) && isNextLevel) {
result.put("nextLevelGap", levelConfig.getInviteCount() - mkDistributionUser.getInviteCount()); distributionUser.put("nextLevelGap", levelConfig.getInviteCount() - mkDistributionUser.getInviteCount());
break; break;
} }
if (levelConfig.getId().equals(mkDistributionUser.getDistributionLevelId())) { if (levelConfig.getId().equals(mkDistributionUser.getDistributionLevelId())) {
result.put("level", levelConfig.getLevel()); distributionUser.put("level", levelConfig.getLevel());
result.put("levelName", levelConfig.getName()); distributionUser.put("levelName", levelConfig.getName());
result.put("levelOneCommission", levelConfig.getLevelOneCommission()); distributionUser.put("levelOneCommission", levelConfig.getLevelOneCommission());
result.put("levelTwoCommission", levelConfig.getLevelTwoCommission()); distributionUser.put("levelTwoCommission", levelConfig.getLevelTwoCommission());
isNextLevel = true; isNextLevel = true;
} }
} }
} else { } else {
result.put("level", 0); distributionUser.put("level", 0);
result.put("levelName", ""); distributionUser.put("levelName", "");
} }
result.put("distributionUser", distributionUser);
} else { } else {
result.put("config", mkDistributionConfigVO); result.put("config", mkDistributionConfigVO);
} }