diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java index c02f258..509c7da 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java @@ -155,17 +155,21 @@ public class ProjectDetailController { BigDecimal maxCommissionRate = projectDetail.getMaxCommissionRate(); if (currentCommissionRate.compareTo(maxCommissionRate) > 0) subUserProjectCommission.setCurrentCommissionRate(maxCommissionRate); } - // 3.用Map集合存储上级用户对下级用户的抽佣比例 - Map commissionRateMap = new HashMap<>(); - for (SubUserProjectCommission subUserProjectCommission : subUserProjectCommissionList) { - Long userId = subUserProjectCommission.getUserId(); - Long subUserId = subUserProjectCommission.getSubUserId(); - BigDecimal currentCommissionRate = subUserProjectCommission.getCurrentCommissionRate(); - String key = userId + "-" + subUserId; - commissionRateMap.put(key, currentCommissionRate); - } + + // 更新下级用户项目明细抽佣表记录 + + // 更新用户项目明细抽佣表记录 +// // 3.用Map集合存储上级用户对下级用户的抽佣比例 +// Map commissionRateMap = new HashMap<>(); +// for (SubUserProjectCommission subUserProjectCommission : subUserProjectCommissionList) { +// Long userId = subUserProjectCommission.getUserId(); +// Long subUserId = subUserProjectCommission.getSubUserId(); +// BigDecimal currentCommissionRate = subUserProjectCommission.getCurrentCommissionRate(); +// String key = userId + "-" + subUserId; +// commissionRateMap.put(key, currentCommissionRate); +// } // 获取所有的小程序用户 - List userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.DEFAULT_ROLE, userInfoService); +// List userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.DEFAULT_ROLE, userInfoService); // 用来存储每个用户的上级列表 // Map> userParentMap = new HashMap<>(); // for (UserInfo userInfo : userInfoList) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a17ec4c..ad9a171 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test + active: dev