diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index 32d31e6a..c4af6ece 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -99,7 +99,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl 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 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); }