|
@@ -126,8 +126,8 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, accountIds);
|
|
weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, accountIds);
|
|
//月消耗
|
|
//月消耗
|
|
String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
- result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
|
|
- result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
|
|
|
|
|
|
+ result.put("weekCharge", new BigDecimal(weekCharge));
|
|
|
|
+ result.put("monthCharge", new BigDecimal(monthCharge));
|
|
//现金消耗 + 环比ROI
|
|
//现金消耗 + 环比ROI
|
|
JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
@@ -138,8 +138,8 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, accountIds);
|
|
weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, accountIds);
|
|
//月消耗
|
|
//月消耗
|
|
String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
- result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
|
|
- result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
|
|
|
|
|
|
+ result.put("weekCharge", new BigDecimal(weekCharge));
|
|
|
|
+ result.put("monthCharge", new BigDecimal(monthCharge));
|
|
//现金消耗 + 环比ROI
|
|
//现金消耗 + 环比ROI
|
|
JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|