From 206b238e6e58394115f7f31be0298720f80ea601 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 4 Jul 2024 10:31:08 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E4=BF=AE=E5=A4=8D=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=AB=98=E5=BE=B7=E6=97=B6=E7=AB=99=E7=82=B9=E8=AE=A1?=
 =?UTF-8?q?=E8=B4=B9=E6=A8=A1=E6=9D=BF=E8=AE=A1=E4=B8=BA=E9=9B=86=E5=9B=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E8=AE=A1=E8=B4=B9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/pile/PileBillingTemplateMapper.xml | 1 +
 .../thirdparty/amap/service/impl/AMapServiceImpl.java        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
index 37a0b0c22..2ff424374 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
@@ -595,6 +595,7 @@
         where
             t2.del_flag = '0'
         and t2.status = '1'
+        and t2.member_flag = '0'
         and t2.station_id in
         <foreach collection="stationIdList" item="item" open="(" separator="," close=")">
             #{item,jdbcType=VARCHAR}
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
index 7ec41f8cf..69669065f 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
@@ -446,6 +446,11 @@ public class AMapServiceImpl implements AMapService {
         return priceList;
     }
 
+    /**
+     * 通过站点idList查询对应的计费模板
+     * @param stationIdList
+     * @return
+     */
     private Map<String, List<AMapPriceChargingInfo>> getPriceInfoByStationIdList(List<String> stationIdList) {
         Map<String, List<AMapPriceChargingInfo>> resultMap = Maps.newHashMap();