From 8ff8247bb95ee74f651d2571bb661db0aede4844 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Wed, 28 May 2025 18:53:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=92=8C=E7=99=BB=E5=BD=95=E6=97=B6=E7=9A=84=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/project/ProjectDetailController.java | 5 ++++- src/main/resources/application.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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 6c49653..d0b1047 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java @@ -163,8 +163,11 @@ public class ProjectDetailController { BigDecimal projectMinSettlementPrice = projectDetail.getProjectMinSettlementPrice(); // 封装Map集合（键：下级用户id，值：下级用户单价） Map subUserUnitPriceMap = new HashMap<>(); + // 获取小程序用户的根用户 + List userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.DEFAULT_ROLE, userInfoService); + UserInfo rootUserInfo = userInfoList.get(0); // 存储根用户的单价 - subUserUnitPriceMap.put(0L, projectSettlementPrice); + subUserUnitPriceMap.put(rootUserInfo.getId(), projectSettlementPrice); for (SubUserProjectCommission subUserProjectCommission : subUserProjectCommissionList) { // 记录上级用户的对下级用户的抽佣比例 BigDecimal currentCommissionRate = subUserProjectCommission.getCurrentCommissionRate(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ad9a171..9689193 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev + active: test-caozhe