From 4c1a14fdb73a7606bc5304c0ed68f21f308e341b Mon Sep 17 00:00:00 2001 From: yuyang Date: Wed, 1 Jun 2022 17:30:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=B4=BB=E5=8A=A8=E7=94=B5=E8=B4=B9=E3=80=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=B4=B9=E3=80=81=E6=80=BB=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/XhpcHistoryOrderServiceImpl.java | 3 +++ .../src/main/resources/mapper/XhpcHistoryOrderMapper.xml | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index d6ee3cab..3f7369a5 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -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", "流量方总金额抽成"); diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 93543055..d3457fcb 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -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,