mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-10 18:30:02 +08:00
update 订单列表页汇总数据结算金额换为实收金额
This commit is contained in:
@@ -21,6 +21,9 @@ public class OrderTotalDataVO {
|
|||||||
// 总用电量
|
// 总用电量
|
||||||
private BigDecimal sumUsedElectricity;
|
private BigDecimal sumUsedElectricity;
|
||||||
|
|
||||||
|
// 总实收金额
|
||||||
|
private BigDecimal sumActualReceivedAmount;
|
||||||
|
|
||||||
// 总结算金额
|
// 总结算金额
|
||||||
private BigDecimal sumSettleAmount;
|
private BigDecimal sumSettleAmount;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1952,6 +1952,7 @@
|
|||||||
select
|
select
|
||||||
IFNULL(sum(t1.order_amount),0) as sumOrderAmount,
|
IFNULL(sum(t1.order_amount),0) as sumOrderAmount,
|
||||||
IFNULL(sum(t4.total_used_electricity),0) as sumUsedElectricity,
|
IFNULL(sum(t4.total_used_electricity),0) as sumUsedElectricity,
|
||||||
|
IFNULL(sum(t1.actual_received_amount), 0) as sumActualReceivedAmount,
|
||||||
IFNULL(sum(t1.settle_amount),0) as sumSettleAmount
|
IFNULL(sum(t1.settle_amount),0) as sumSettleAmount
|
||||||
from order_basic_info t1
|
from order_basic_info t1
|
||||||
left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
|
left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
|
||||||
|
|||||||
Reference in New Issue
Block a user