admin1/qingcheng-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了接口（小程序用户查看下级用户的项目明细抽佣情况）

Browse Source
This commit is contained in:
chen-xin-zhi 2025-06-04 09:23:12 +08:00
parent 72d2e6b45f
commit 98f95befd7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java
View File

@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -99,9 +100,12 @@ public class ProjectCommissionController {
String projectDetailName = projectDetailMap.get(projectDetailId); String projectDetailName = projectDetailMap.get(projectDetailId);
BigDecimal maxCommissionRate = rateMap.get(projectDetailId); BigDecimal maxCommissionRate = rateMap.get(projectDetailId);
ProjectDetailCommissionVO projectDetailCommissionVO = commonService.copyProperties(projectCommission, ProjectDetailCommissionVO.class); ProjectDetailCommissionVO projectDetailCommissionVO = commonService.copyProperties(projectCommission, ProjectDetailCommissionVO.class);
projectDetailCommissionVO.setCurrentCommissionRate(currentCommissionRate);
projectDetailCommissionVO.setProjectDetailName(projectDetailName); projectDetailCommissionVO.setProjectDetailName(projectDetailName);
projectDetailCommissionVO.setMaxCommissionRate(maxCommissionRate); 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); projectDetailCommissionVO.setAgentUnitPrice(agentUnitPrice);
projectDetailCommissionVOList.add(projectDetailCommissionVO); projectDetailCommissionVOList.add(projectDetailCommissionVO);
} }
@ -123,6 +127,7 @@ public class ProjectCommissionController {
ProjectCommissionVO projectCommissionVO = commonService.copyProperties(project, ProjectCommissionVO.class); ProjectCommissionVO projectCommissionVO = commonService.copyProperties(project, ProjectCommissionVO.class);
Long projectId = project.getId(); Long projectId = project.getId();
List<ProjectDetailCommissionVO> projectDetailCommissionVOS = pdcMap.get(projectId); List<ProjectDetailCommissionVO> projectDetailCommissionVOS = pdcMap.get(projectId);
projectCommissionVO.setProjectId(projectId);
projectCommissionVO.setProjectDetailCommissionVOList(projectDetailCommissionVOS); projectCommissionVO.setProjectDetailCommissionVOList(projectDetailCommissionVOS);
projectCommissionVOList.add(projectCommissionVO); projectCommissionVOList.add(projectCommissionVO);
} }
@ -201,7 +206,9 @@ public class ProjectCommissionController {
subUserProjectDetailCommissionVO.setMaxCommissionRate(maxCommissionRate); subUserProjectDetailCommissionVO.setMaxCommissionRate(maxCommissionRate);
BigDecimal myUnitPrice = subUserProjectCommission.getMyUnitPrice(); BigDecimal myUnitPrice = subUserProjectCommission.getMyUnitPrice();
BigDecimal currentCommissionRate = subUserProjectCommission.getCurrentCommissionRate(); 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); subUserProjectDetailCommissionVO.setAgentUnitPrice(agentUnitPrice);
subUserProjectDetailCommissionVOList.add(subUserProjectDetailCommissionVO); subUserProjectDetailCommissionVOList.add(subUserProjectDetailCommissionVO);
} }