mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-07 03:20:06 +08:00
update 首页订单金额数据
This commit is contained in:
@@ -3020,7 +3020,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
|
|
||||||
List<String> orderCodeList = Lists.newArrayList();
|
List<String> orderCodeList = Lists.newArrayList();
|
||||||
for (IndexOrderInfoVO indexOrderInfoVO : entry.getValue()) {
|
for (IndexOrderInfoVO indexOrderInfoVO : entry.getValue()) {
|
||||||
totalOrderAmount = totalOrderAmount.add(new BigDecimal(indexOrderInfoVO.getTotalOrderAmount()));
|
// totalOrderAmount = totalOrderAmount.add(new BigDecimal(indexOrderInfoVO.getTotalOrderAmount()));
|
||||||
|
totalOrderAmount = totalOrderAmount.add(new BigDecimal(indexOrderInfoVO.getTotalSettleAmount()));
|
||||||
totalElectricity = totalElectricity.add(new BigDecimal(indexOrderInfoVO.getTotalElectricity()));
|
totalElectricity = totalElectricity.add(new BigDecimal(indexOrderInfoVO.getTotalElectricity()));
|
||||||
orderCodeList.addAll(Lists.newArrayList(StringUtils.split(indexOrderInfoVO.getOrderCodes(), ",")));
|
orderCodeList.addAll(Lists.newArrayList(StringUtils.split(indexOrderInfoVO.getOrderCodes(), ",")));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,11 @@ public class IndexOrderInfoVO {
|
|||||||
*/
|
*/
|
||||||
private String totalOrderAmount;
|
private String totalOrderAmount;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 总结算金额
|
||||||
|
*/
|
||||||
|
private String totalSettleAmount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 尖时段总用电量
|
* 尖时段总用电量
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -2970,6 +2970,7 @@
|
|||||||
SELECT trade_date AS date,
|
SELECT trade_date AS date,
|
||||||
order_codes as orderCodes,
|
order_codes as orderCodes,
|
||||||
use_electricity AS totalElectricity,
|
use_electricity AS totalElectricity,
|
||||||
|
settle_amount as totalSettleAmount,
|
||||||
total_amount as totalOrderAmount
|
total_amount as totalOrderAmount
|
||||||
from settle_order_report
|
from settle_order_report
|
||||||
where del_flag = '0'
|
where del_flag = '0'
|
||||||
|
|||||||
Reference in New Issue
Block a user