配置文件删除EN+配置，订单查询修改

admin-web/src/views/admin/ordering/index.vue

@@ -41,7 +41,7 @@
             class="wd150 mr10">
         </el-input>
         <ext-select
-            v-model="state.formQuery.stationId"
+            v-model="state.formQuery.stationIds"
             placeholder="站点"
             clearable
             url="station/listStation"
@@ -411,4 +411,4 @@ const handleTableSortChange = (column, prop, order) => {
 // defineExpose({
 //     loadData,
 // });
-</script>
+</script>

admin/src/main/resources/application-dev.yml

@@ -1,24 +1,3 @@
-# EN+充电配置
-en-plus:
-  # 运营商ID
-  operatorId: MA5HJNDG1
-  # 运营商密钥
-  operatorSecret: 5009db3dc1e94ea8
-  # 消息密钥
-  dataSecret: 8c15f5bf050948ba
-  # 消息密钥初始化向量
-  dataSecretIv: 915bea94fa13461d
-  # 签名密钥
-  sigSecret: 46050b0bb5b7415c
-  # 最小充电余额（分）
-  chargeMinAmount: 200
-  # 接口地址
-  apiDomain: https://dev.en-plus.cn/Charge/evcs/v1//MA5HJNDG1/
-  # sass配置
-  sass: https://dev.en-plus.cn/Charge/op/login?username=快与慢&password=Admin123
-  # sass结算订单
-  sassClose: https://dev.en-plus.cn/Charge/op/analyze/order/close?orderCode=
-
 # 微信支付
 wechat:
   payment:
@@ -124,7 +103,7 @@ spring:
     port: 5674
     username: kym
     password: kym!@123
-    virtual-host: /
+    virtual-host: /dev
     publisher-returns: true
     publisher-confirms: true
     listener:

admin/src/main/resources/application-prod.yml

@@ -1,24 +1,3 @@
-# EN+充电配置
-en-plus:
-  # 运营商ID
-  operatorId: MA5HJNDG1
-  # 运营商密钥
-  operatorSecret: c7fd9b753a9f434e
-  # 消息密钥
-  dataSecret: 5cb7e12da198420a
-  # 消息密钥初始化向量
-  dataSecretIv: 8a6ac88326bc4d3f
-  # 签名密钥
-  sigSecret: 2365b20f69e44817
-  # 最小充电余额（分）
-  chargeMinAmount: 200
-  # 接口地址
-  apiDomain: https://api.en-plus.cn:8080/Charge/evcs/v1//MA5HJNDG1/
-  # sass配置
-  sass: https://api.en-plus.cn:8080/Charge/op/login?username=快与慢工程&password=Kuaiyuman2o22
-  # sass结算订单
-  sassClose: https://api.en-plus.cn:8080/Charge/op/analyze/order/close?orderCode=
-
 # 微信支付
 wechat:
   payment:
@@ -140,4 +119,4 @@ spring:
         batch-size: 100 #每次批量消费大小
 
 kym:
-  notify-email: zaizai@kuaiyuman.cn,skyline@kuaiyuman.cn
+  notify-email: zaizai@kuaiyuman.cn,skyline@kuaiyuman.cn

entity/src/main/java/com/kym/entity/admin/queryParams/CustomChargeOrdersQueryParam.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.List;
 
 
 /**
@@ -34,7 +35,7 @@ public class CustomChargeOrdersQueryParam extends PageParams {
     /**
      * 站点id
      */
-    private String stationId;
+    private List<String> stationIds;
     /**
      * 充电桩序列号
      */

mapper/src/main/resources/mappers/miniapp/ChargeOrderMapper.xml

@@ -102,9 +102,6 @@
             <if test="params.startChargeSeq != null and params.startChargeSeq != ''">
                 and t1.start_charge_seq = #{params.startChargeSeq}
             </if>
-            <if test="params.stationId != null and params.stationId != ''">
-                and t1.station_id = #{params.stationId}
-            </if>
             <if test="params.orderStatus != null">
                 and t1.order_status = #{params.orderStatus}
             </if>
@@ -114,6 +111,12 @@
             <if test="params.endDate != null">
                 and t1.start_time &lt;= #{params.endDate}
             </if>
+            <if test="params.stationIds != null and params.stationIds.size() > 0">
+                and t1.station_id IN
+                <foreach collection="params.stationIds" item="stationId" index="index" open="(" close=")" separator=",">
+                    #{stationId}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -153,9 +156,6 @@
             <if test="params.connectorId != null and params.connectorId != ''">
                 and t1.connector_id = #{params.connectorId}
             </if>
-            <if test="params.stationId != null and params.stationId != ''">
-                and t1.station_id = #{params.stationId}
-            </if>
             <if test="params.startChargeSeq != null and params.startChargeSeq != ''">
                 and t1.start_charge_seq = #{params.startChargeSeq}
             </if>
@@ -177,13 +177,19 @@
             <if test="params.stopReason != null">
                 and t1.stop_reason = #{params.stopReason}
             </if>
+            <if test="params.stationIds != null and params.stationIds.size() > 0">
+                and t1.station_id IN
+                <foreach collection="params.stationIds" item="stationId" index="index" open="(" close=")" separator=",">
+                    #{stationId}
+                </foreach>
+            </if>
         </where>
         order by t1.id desc
     </select>
 
     <select id="stationStat" resultMap="StationStatMap" parameterType="com.kym.entity.admin.queryParams.StatQueryParam">
         SELECT
-        <if test="params.stationId != null and params.stationId != ''">
+        <if test="params.stationIds != null and params.stationId != ''">
             t1.station_id,
         </if>
         <if test="params.type == null or params.type == 'day'">

service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -106,8 +106,8 @@ public class ChargeOrderServiceImpl extends MyBaseServiceImpl<ChargeOrderMapper,
             params.setConnectorId(connectorId);
         }
         // 判断数据权限
-        if (params.getStationId() == null) {
-            params.setStationId(CommUtil.isEmptyOrNull(KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong())) ? null : KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong()).get(0));
+        if (params.getStationIds() == null) {
+            params.setStationIds(CommUtil.isEmptyOrNull(KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong())) ? null : KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong()));
         }
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         // 查询订单列表（订单编号，手机号，充电站，充电桩SN/短码，订单状态，建单时间，结算时间，充电电量，实付金额，付款状态）
@@ -130,8 +130,8 @@ public class ChargeOrderServiceImpl extends MyBaseServiceImpl<ChargeOrderMapper,
         }
         // 判断数据权限
         var adminStationIds = KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong());
-        if (params.getStationId() != null && adminStationIds.contains(params.getStationId())) {
-            params.setStationId(adminStationIds.get(0));
+        if (params.getStationIds() == null) {
+            params.setStationIds(CommUtil.isEmptyOrNull(KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong())) ? null : KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong()));
         }
         // 查询订单列表（订单编号，手机号，充电站，充电桩SN/短码，订单状态，建单时间，结算时间，充电电量，实付金额，付款状态）
         var result = baseMapper.listChargeOrders(params);