yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

历史订单增加了活动电费、服务费、总金额的导出

Browse Source
This commit is contained in:
yuyang 2022-06-01 17:30:08 +08:00
parent 5dbb6ee49f
commit 4c1a14fdb7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java
View File

@ -316,6 +316,9 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
writer.addHeaderAlias("powerPriceTotal", "总电费");
writer.addHeaderAlias("servicePriceTotal", "总服务费");
writer.addHeaderAlias("totalPrice", "订单总价");
writer.addHeaderAlias("activityPowerPriceTotal", "活动总电费");
writer.addHeaderAlias("activityServicePriceTotal", "活动总服务费");
writer.addHeaderAlias("activityTotalPrice", "活动总金额");
writer.addHeaderAlias("promotionDiscount", "电站活动抵扣总金额");
writer.addHeaderAlias("actPrice", "实际用户支付金额");
writer.addHeaderAlias("internetCommission", "流量方总金额抽成");

7
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -658,8 +658,8 @@
ho.confirm_Result as confirmResult,
co.charging_time as chargingTime,
ho.total_power as chargingDegree,
co.start_time as startTime,
co.end_time as endTime,
ho.start_time as startTime,
ho.end_time as endTime,
co.update_time as updateTime,
co.source as source,
co.Plate_num as plateNum,
@ -670,6 +670,9 @@
ho.power_price_total as powerPriceTotal,
ho.service_price_total as servicePriceTotal,
ho.promotion_discount as promotionDiscount,
ho.activity_power_price_total as activityPowerPriceTotal,
ho.activity_service_price_total as activityServicePriceTotal,
ho.activity_total_price as activityTotalPrice,
ho.act_power_price as actPowerPrice,
ho.act_service_price as actServicePrice,
(ho.act_power_price+ho.act_service_price) as actSumPrice,