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 5d7ff0b2..24bb90d7 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 @@ -139,6 +139,21 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { writer.addHeaderAlias("orderType", "状态1 自动结算 2 平台结算"); writer.addHeaderAlias("startSoc", "开始soc"); writer.addHeaderAlias("endSoc", "结束soc"); + writer.addHeaderAlias("powerPriceTotal", "总电费"); + writer.addHeaderAlias("servicePriceTotal", "总服务费"); + writer.addHeaderAlias("totalPrice", "订单总价"); + writer.addHeaderAlias("promotionDiscount", "电站活动抵扣总金额"); + writer.addHeaderAlias("actPrice", "实际用户支付金额"); + writer.addHeaderAlias("internetCommission", "流量方总金额抽成"); + writer.addHeaderAlias("internetSvcCommission", "流量方服务费抽成"); + writer.addHeaderAlias("internetDegreeCommission", "流量方电量抽成"); + writer.addHeaderAlias("platformCommission", "平台总金额抽成"); + writer.addHeaderAlias("platformSvcCommisssion", "平台服务费抽成"); + writer.addHeaderAlias("operationCommission", "运维总抽成"); + writer.addHeaderAlias("operationSvcCommission", "运维服务费抽成"); + writer.addHeaderAlias("actPowerPrice", "运营商电费"); + writer.addHeaderAlias("actServicePrice", "运营商服务费"); + writer.addHeaderAlias("actSumPrice", "运营商总金额"); // writer.addHeaderAlias("internetSerialNumber", "电站名称"); writer.addHeaderAlias("totalPrice", "订单总价"); writer.addHeaderAlias("actPrice", "实际价格"); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java index 93307e67..d01a8e44 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java @@ -467,6 +467,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { map.put("actServicePrice",0.00); map.put("internetCommission",0.00); map.put("internetSvcCommission",0.00); + map.put("internetDegreeCommission",0.00); map.put("platformCommission",0.00); map.put("platformSvcCommisssion",0.00); map.put("operationCommission",0.00); 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 5f609f11..952b83a4 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -635,6 +635,21 @@ inu.phone as internetUserPhone, inu.name as internetName, apu.phone as appUserPhone, + ho.power_price_total as powerPriceTotal, + ho.service_price_total as servicePriceTotal, + ho.total_price as totalPrice, + ho.promotion_discount as promotionDiscount, + ho.act_price as actPrice, + ho.act_power_price as actPowerPrice, + ho.act_service_price as actServicePrice, + (ho.act_power_price+ho.act_service_price) as actSumPrice, + ho.internet_commission as internetCommission, + ho.internet_svc_commission as internetSvcCommission, + ho.internet_degree_commission as internetDegreeCommission, + ho.platform_commission as platformCommission, + ho.platform_svc_commisssion as platformSvcCommisssion, + ho.operation_commission as operationCommission, + ho.operation_svc_commission as operationSvcCommission, case when co.source=0 then "C端用户" when co.source=1 then "流量方用户" when co.source=2 then "社区用户"