From a96c374b948f907bb9dd7c0d4ab6b949bf14535f Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 13 Nov 2025 16:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9F=A5=E8=AF=A2=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=8F=AA=E6=9C=89=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A9=E7=9A=84=E5=BC=82=E5=B8=B8=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/dto/QueryOrderDTO.java   |  5 +++++
 .../impl/OrderBasicInfoServiceImpl.java       | 19 +++++++++++++++++++
 .../mapper/pile/OrderBasicInfoMapper.xml      |  6 ++++++
 3 files changed, 30 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
index a0b7afae7..f1710ad94 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
@@ -107,4 +107,9 @@ public class QueryOrderDTO extends BaseEntity {
 	 * 车牌号
 	 */
 	private String plateNumber;
+
+	/**
+	 * 排除的站点Id列表
+	 */
+	private List<Integer> excludeStationIdList;
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index e66c25841..ca934bc53 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -291,6 +291,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      */
     @Override
     public List<OrderListVO> selectOrderBasicInfoList(QueryOrderDTO dto) {
+        excludePersonalPileStation(dto); // 筛选个人桩站点
         List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
         if (CollectionUtils.isEmpty(orderListVOS)) {
             return orderListVOS;
@@ -339,6 +340,24 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         return orderListVOS;
     }
 
+    /**
+     * 如果查询订单状态只有异常的情况下，排除个人桩的异常订单
+     */
+    private void excludePersonalPileStation(QueryOrderDTO dto) {
+        // 如果orderStatus不等于异常，直接返回
+        if (!OrderStatusEnum.ABNORMAL.getValue().equals(dto.getOrderStatus())) {
+            return;
+        }
+        // 如果dto中除了订单状态还有其他查询条件，则返回
+        if (dto.getMerchantId() != null || dto.getStationId() != null || dto.getOrderCode() != null
+                || dto.getMobileNumber() != null || dto.getTransactionCode() != null || dto.getPileSn() != null
+                || dto.getPlateNumber() != null) {
+            return;
+        }
+        // 设置个人桩站id, 148-个人桩站点; 684-7KW小直流个人桩站点
+        dto.setExcludeStationIdList(Lists.newArrayList(148, 684));
+    }
+
     private void batchQueryFeeAmt(List<OrderListVO> orderListVOS) {
         // 批量查手续费
         List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 3e6626bd0..083a3976b 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -1988,6 +1988,12 @@
                 #{stationDeptId}
             </foreach>
         </if>
+        <if test="excludeStationIdList != null and excludeStationIdList.size() != 0">
+            and t1.station_id not in
+            <foreach close=")" collection="excludeStationIdList" item="excludeStationId" open="(" separator=",">
+                #{excludeStationId}
+            </foreach>
+        </if>
         order by t1.create_time desc
     </select>