|
@@ -151,15 +151,18 @@ public class PerformanceServiceImpl extends ServiceImpl<PerformanceMapper, Perfo
|
|
List<OptimizerCostDetailVO> detailVOS = performanceMapper.getMemberPerformanceByOrgCode(startDate, endDate, year, quarter, sysUser.getOrgCode());
|
|
List<OptimizerCostDetailVO> detailVOS = performanceMapper.getMemberPerformanceByOrgCode(startDate, endDate, year, quarter, sysUser.getOrgCode());
|
|
List<OptimizerCostDetailVO> getDetails = new ArrayList<>();
|
|
List<OptimizerCostDetailVO> getDetails = new ArrayList<>();
|
|
BigDecimal memberTotaRoyalty = BigDecimal.ZERO;
|
|
BigDecimal memberTotaRoyalty = BigDecimal.ZERO;
|
|
- result.put("totalCost", totalCostVo.getTotalCost());
|
|
|
|
|
|
+ BigDecimal memberTotaCost = BigDecimal.ZERO;
|
|
|
|
+ result.put("mediaTotalCost", totalCostVo.getTotalCost());
|
|
result.put("mediaTask", config.getMediaTask());
|
|
result.put("mediaTask", config.getMediaTask());
|
|
for (OptimizerCostDetailVO vo : detailVOS) {
|
|
for (OptimizerCostDetailVO vo : detailVOS) {
|
|
BigDecimal royalty = getTotalRoyalty(config, vo, totalCostVo);
|
|
BigDecimal royalty = getTotalRoyalty(config, vo, totalCostVo);
|
|
vo.setTotalRoyalty(royalty);
|
|
vo.setTotalRoyalty(royalty);
|
|
memberTotaRoyalty = memberTotaRoyalty.add(royalty);
|
|
memberTotaRoyalty = memberTotaRoyalty.add(royalty);
|
|
|
|
+ memberTotaCost = memberTotaCost.add(vo.getTotalCost());
|
|
getDetails.add(vo);
|
|
getDetails.add(vo);
|
|
}
|
|
}
|
|
result.put("memberDetails", getDetails);
|
|
result.put("memberDetails", getDetails);
|
|
|
|
+ result.put("memberTotalCost", memberTotaCost.setScale(2, RoundingMode.HALF_UP).toString());
|
|
if (totalCostVo.getTotalCost().compareTo(config.getMediaTask()) < 0) {
|
|
if (totalCostVo.getTotalCost().compareTo(config.getMediaTask()) < 0) {
|
|
result.put("totalRoyalty", "0");
|
|
result.put("totalRoyalty", "0");
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
|