From 7d448c668151677f015945c661ec5c20cff85420 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Fri, 13 May 2022 09:54:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=B1=8F=E6=8C=89?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/XhpcClearingCheckoutMapper.xml  | 4 ++--
 .../order/service/impl/XhpcRealTimeOrderServiceImpl.java  | 8 ++++++++
 .../src/main/resources/mapper/XhpcStatisticsMapper.xml    | 2 +-
 .../src/main/resources/mapper/XhpcOperatorMapper.xml      | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
index 83d31054..f7cbe34e 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
@@ -60,10 +60,10 @@
       and cc.create_time <![CDATA[ <= ]]> #{params.endTime}
     </if>
       <if test="params.type==1">
-          and cc.operator_id= in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId}))
+          and cc.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId}))
       </if>
       <if test="params.type==2">
-          and cc.operator_id= in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId}))
+          and cc.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId}))
       </if>
   </select>
 
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 c50d06b3..18ec9820 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
@@ -1452,4 +1452,12 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
     }
 
 
+    //判斷活动时间、电费、服务费、公式是否和场站一致
+    private boolean getRateOrActivityFormul(){
+
+
+
+        return false;
+    }
+
 }
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml
index 33556e60..07c06372 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml
@@ -1061,7 +1061,7 @@
         left join xhpc_internet_user as iu on iu.internet_user_id = ss.charging_mode
         where ss.del_flag=0 and ss.type=2
         <if test="startTime !=null and startTime !=''">
-            and ss.create_time &gt;= #{endTime}
+            and ss.create_time &gt;= #{startTime}
         </if>
         <if test="endTime !=null and endTime !=''">
             and ss.create_time &lt;= #{endTime}
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
index 9a27ce08..19897067 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
@@ -325,10 +325,10 @@
             and xo.operator_id =#{operatorId}
         </if>
         <if test="type==1">
-            and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{userId}))
+            and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{logOperatorId}))
         </if>
         <if test="type==2">
-            and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{userId}))
+            and xo.operator_id in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{logOperatorId}))
         </if>
         group by xo.operator_id
         ORDER BY xo.update_time DESC