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); }