From 83783db947c785dd259061266c033c21f2a928aa Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Fri, 17 Dec 2021 11:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E7=94=B5=E5=9B=BE=E5=A2=9E=E5=8A=A0=E7=94=B5=E9=87=8F=E6=8A=BD?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/XhpcHistoryOrderServiceImpl.java     |  3 +-
 .../impl/XhpcRealTimeOrderServiceImpl.java    |  2 +-
 .../mapper/XhpcHistoryOrderMapper.xml         | 63 +++++++++----------
 ...hpcStationInternetBlacklistController.java | 10 +++
 .../service/impl/XhpcAppUserServiceImpl.java  |  1 +
 5 files changed, 45 insertions(+), 34 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 24bb90d7..25194af3 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
@@ -129,6 +129,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService {
         ExcelWriter writer = ExcelUtil.getWriter(true);
         writer.addHeaderAlias("historyOrderId", "历史订单ID");
         writer.addHeaderAlias("serialNumber", "订单号");
+        writer.addHeaderAlias("internetSerialNumber", "流量方订单号");
         writer.addHeaderAlias("chargingStationName", "电站名称");
         writer.addHeaderAlias("pileSerialNumber", "桩编号");
         writer.addHeaderAlias("terminalName", "终端名称");
@@ -163,7 +164,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService {
         writer.addHeaderAlias("startTime", "开始充电时间");
         writer.addHeaderAlias("endTime", "结束充电时间");
         writer.addHeaderAlias("updateTime", "结算时间");
-        writer.addHeaderAlias("sourceName", "订单来源");
+        writer.addHeaderAlias("internetName", "订单来源");
 //        writer.addHeaderAlias("plateNum", "电站名称");
 //        writer.addHeaderAlias("disputeOrderStatus", "桩编号");
 
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
index 54ed4ff4..e1152979 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
@@ -369,7 +369,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
                     }
                     //0总金额提成 1服务费提成
                     if(new BigDecimal(0).compareTo(commissionRate)==-1){
-                        if("0".equals(commissionType) || "1".equals(commissionType)){
+                        if("0".equals(commissionType) || "1".equals(commissionType)|| "2".equals(commissionType)){
                             //流量方的钱
                             if("0".equals(commissionType)){
                                 BigDecimal decimal1 = surplusPowerPrice.multiply(commissionRate).setScale(2, BigDecimal.ROUND_DOWN);
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 952b83a4..11b2ad5c 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -834,42 +834,41 @@
     </select>
 
     <select id="getStatistisList" resultType="com.xhpc.order.dto.XhpcChargeHistoryOrder">
-        select
-            ho.history_order_id as historyOrderId,
-            ho.power_price_total as powerPriceTotal,
-            ho.service_price_total as servicePriceTotal,
-            ho.promotion_discount as promotionDiscount,
-            ho.total_price as totalPrice,
-            ho.act_price as actPrice,
-            ho.act_power_price as actPowerPrice,
-            ho.act_service_price as actServicePrice,
-            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,
-            co.source                   as source,
-            co.charge_order_id          as chargeOrderId,
-            co.charging_station_id      as chargingStationId,
-            co.terminal_id              as terminalId,
-            ho.start_time               as startTime,
-            ho.end_time                 as endTime,
-            co.charging_time_number     as chargingTimeNumber,
-            co.charging_degree          as chargingDegree,
-            co.rate_model_id            as rateModelId,
-            cs.operator_id              as operatorId,
-            te.charging_pile_id         as chargingPileId,
-            co.user_id                  as userId,
-            co.user_id                  as internetUserId,
-            ho.charging_mode            as chargingMode,
-            ho.create_time              as createTime
+        select ho.history_order_id           as historyOrderId,
+               ho.power_price_total          as powerPriceTotal,
+               ho.service_price_total        as servicePriceTotal,
+               ho.promotion_discount         as promotionDiscount,
+               ho.total_price                as totalPrice,
+               ho.act_price                  as actPrice,
+               ho.act_power_price            as actPowerPrice,
+               ho.act_service_price          as actServicePrice,
+               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,
+               co.source                     as source,
+               co.charge_order_id            as chargeOrderId,
+               co.charging_station_id        as chargingStationId,
+               co.terminal_id                as terminalId,
+               ho.start_time                 as startTime,
+               ho.end_time                   as endTime,
+               co.charging_time_number       as chargingTimeNumber,
+               co.charging_degree            as chargingDegree,
+               co.rate_model_id              as rateModelId,
+               cs.operator_id                as operatorId,
+               te.charging_pile_id           as chargingPileId,
+               co.user_id                    as userId,
+               co.user_id                    as internetUserId,
+               ho.charging_mode              as chargingMode,
+               ho.create_time                as createTime
         from xhpc_history_order ho
                  left join xhpc_charge_order co on co.charge_order_id = ho.charge_order_id
                  left join xhpc_charging_station cs on cs.charging_station_id = co.charging_station_id
                  left join xhpc_terminal as te on te.terminal_id = ho.terminal_id
-        where ho.state = #{state} and ho.total_price &gt;0  and ho.end_time &gt; ho.start_time  and ho.power_price_total !=0
+            where ho.state = #{state} and ho.total_price &gt;0  and ho.end_time &gt; ho.start_time  and ho.power_price_total !=0
         limit 0,#{number}
     </select>
 
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java
index ec6dfc33..cc6dd9f7 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java
@@ -62,4 +62,14 @@ public class XhpcStationInternetBlacklistController extends BaseController {
         List<Map<String, Object>> list = iXhpcStationInternetBlacklistService.list(internetUserId);
         return getDataTable(list);
     }
+
+    @GetMapping("/list1")
+    public TableDataInfo list1(@RequestParam String internetUserId) {
+        List<Map<String, Object>> list = iXhpcStationInternetBlacklistService.list(internetUserId);
+
+
+
+        return getDataTable(list);
+    }
+
 }
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
index b321f85f..75edadee 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
@@ -324,6 +324,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
         String userId = StringUtils.valueOf(loginUser.getUserid());
         Object version = redisService.getCacheObject("global:version");
         Object servicePhone = redisService.getCacheObject("global:phone");
+        //根据不同的用户类型查询不同的信息
         Map<String,Object> result = xhpcAppUserMapper.info(Long.parseLong(userId));
         result.put("version",version);
         result.put("servicePhone",servicePhone);