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 #{params.endTime}
- 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}))
- 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}))
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
- and ss.create_time >= #{endTime}
+ and ss.create_time >= #{startTime}
and ss.create_time <= #{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}
- 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}))
- 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}))
group by xo.operator_id
ORDER BY xo.update_time DESC