From 98f95befd7e51a541598c1805ef3452019c907c7 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Wed, 4 Jun 2025 09:23:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=88=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=B8=8B=E7=BA=A7=E7=94=A8=E6=88=B7=E7=9A=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=98=8E=E7=BB=86=E6=8A=BD=E4=BD=A3=E6=83=85=E5=86=B5?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ProjectCommissionController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java index e1fb3f2..813ac6a 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java @@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -99,9 +100,12 @@ public class ProjectCommissionController { String projectDetailName = projectDetailMap.get(projectDetailId); BigDecimal maxCommissionRate = rateMap.get(projectDetailId); ProjectDetailCommissionVO projectDetailCommissionVO = commonService.copyProperties(projectCommission, ProjectDetailCommissionVO.class); + projectDetailCommissionVO.setCurrentCommissionRate(currentCommissionRate); projectDetailCommissionVO.setProjectDetailName(projectDetailName); projectDetailCommissionVO.setMaxCommissionRate(maxCommissionRate); - BigDecimal agentUnitPrice = myUnitPrice.multiply(BigDecimal.ONE.subtract(currentCommissionRate)); + BigDecimal agentUnitPrice = myUnitPrice + .multiply(BigDecimal.ONE.subtract(currentCommissionRate.divide(BigDecimal.valueOf(100)))) + .setScale(2, RoundingMode.HALF_UP); projectDetailCommissionVO.setAgentUnitPrice(agentUnitPrice); projectDetailCommissionVOList.add(projectDetailCommissionVO); } @@ -123,6 +127,7 @@ public class ProjectCommissionController { ProjectCommissionVO projectCommissionVO = commonService.copyProperties(project, ProjectCommissionVO.class); Long projectId = project.getId(); List projectDetailCommissionVOS = pdcMap.get(projectId); + projectCommissionVO.setProjectId(projectId); projectCommissionVO.setProjectDetailCommissionVOList(projectDetailCommissionVOS); projectCommissionVOList.add(projectCommissionVO); } @@ -201,7 +206,9 @@ public class ProjectCommissionController { subUserProjectDetailCommissionVO.setMaxCommissionRate(maxCommissionRate); BigDecimal myUnitPrice = subUserProjectCommission.getMyUnitPrice(); BigDecimal currentCommissionRate = subUserProjectCommission.getCurrentCommissionRate(); - BigDecimal agentUnitPrice = myUnitPrice.multiply(BigDecimal.ONE.subtract(currentCommissionRate)); + BigDecimal agentUnitPrice = myUnitPrice + .multiply(BigDecimal.ONE.subtract(currentCommissionRate.divide(BigDecimal.valueOf(100)))) + .setScale(2, RoundingMode.HALF_UP); subUserProjectDetailCommissionVO.setAgentUnitPrice(agentUnitPrice); subUserProjectDetailCommissionVOList.add(subUserProjectDetailCommissionVO); }