分销员
This commit is contained in:
parent
94fd4fc34d
commit
da7ddb8128
|
|
@ -99,7 +99,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
|
|||
totalIncomeSumQueryWrapper.eq(MkDistributionUser::getUserId, userId);
|
||||
totalIncomeSumQueryWrapper.eq(MkDistributionUser::getIsDel, 0);
|
||||
centerTopVO = getOneAs(totalIncomeSumQueryWrapper, DistributionCenterTopVO.class);
|
||||
}catch (Exception e){
|
||||
} catch (Exception e) {
|
||||
log.error("查询用户中心数据失败", e);
|
||||
}
|
||||
// 封装顶部收益数据
|
||||
|
|
@ -166,30 +166,33 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
|
|||
.eq(MkDistributionUser::getShopUserId, shopUser.getId()).eq(MkDistributionUser::getShopId, shopId));
|
||||
MkDistributionConfigVO mkDistributionConfigVO = mkDistributionConfigService.detail(shopId);
|
||||
if (mkDistributionUser != null) {
|
||||
result.put("inviteCode", mkDistributionUser.getInviteCode());
|
||||
result.put("status", mkDistributionUser.getStatus() == 9);
|
||||
result.put("totalIncome", mkDistributionUser.getTotalIncome());
|
||||
result.put("pendingIncome", mkDistributionUser.getPendingIncome());
|
||||
Map<String, Object> distributionUser = new HashMap<>();
|
||||
distributionUser.put("distributionId", mkDistributionUser.getId());
|
||||
distributionUser.put("inviteCode", mkDistributionUser.getInviteCode());
|
||||
distributionUser.put("status", mkDistributionUser.getStatus() == 9);
|
||||
distributionUser.put("totalIncome", mkDistributionUser.getTotalIncome());
|
||||
distributionUser.put("pendingIncome", mkDistributionUser.getPendingIncome());
|
||||
if (mkDistributionUser.getDistributionLevelId() != null) {
|
||||
List<MkDistributionLevelConfig> levelConfigList = mkDistributionConfigVO.getLevelConfigList();
|
||||
boolean isNextLevel = false;
|
||||
for (MkDistributionLevelConfig levelConfig : levelConfigList) {
|
||||
if ("invite".equals(mkDistributionConfigVO.getUpgradeType()) && isNextLevel) {
|
||||
result.put("nextLevelGap", levelConfig.getInviteCount() - mkDistributionUser.getInviteCount());
|
||||
distributionUser.put("nextLevelGap", levelConfig.getInviteCount() - mkDistributionUser.getInviteCount());
|
||||
break;
|
||||
}
|
||||
if (levelConfig.getId().equals(mkDistributionUser.getDistributionLevelId())) {
|
||||
result.put("level", levelConfig.getLevel());
|
||||
result.put("levelName", levelConfig.getName());
|
||||
result.put("levelOneCommission", levelConfig.getLevelOneCommission());
|
||||
result.put("levelTwoCommission", levelConfig.getLevelTwoCommission());
|
||||
distributionUser.put("level", levelConfig.getLevel());
|
||||
distributionUser.put("levelName", levelConfig.getName());
|
||||
distributionUser.put("levelOneCommission", levelConfig.getLevelOneCommission());
|
||||
distributionUser.put("levelTwoCommission", levelConfig.getLevelTwoCommission());
|
||||
isNextLevel = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
result.put("level", 0);
|
||||
result.put("levelName", "无");
|
||||
distributionUser.put("level", 0);
|
||||
distributionUser.put("levelName", "无");
|
||||
}
|
||||
result.put("distributionUser", distributionUser);
|
||||
} else {
|
||||
result.put("config", mkDistributionConfigVO);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue