修复了接口(小程序用户查看下级用户的项目明细抽佣情况)
This commit is contained in:
parent
72d2e6b45f
commit
98f95befd7
|
@ -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<ProjectDetailCommissionVO> 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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user