From e2ab44b7724f8c9283b9d3a333b6f850702fd171 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 七月 2026 18:39:07 +0800
Subject: [PATCH] Merge branch '2.2' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.2

---
 ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/mapper/PayOrderQueryPerformanceMapperTest.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/mapper/PayOrderQueryPerformanceMapperTest.java b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/mapper/PayOrderQueryPerformanceMapperTest.java
index 0be2b53..bf49137 100644
--- a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/mapper/PayOrderQueryPerformanceMapperTest.java
+++ b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/mapper/PayOrderQueryPerformanceMapperTest.java
@@ -55,6 +55,24 @@
         assertEquals(3, countOccurrences(refundQuery, "as site_id"));
     }
 
+    @Test
+    void specialRefundListSkipsUnrelatedOrderUnions() throws IOException {
+        InputStream input = getClass().getClassLoader()
+                .getResourceAsStream("mapper/order/TChargingOrderMapper.xml");
+        assertNotNull(input);
+
+        String mapper;
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8))) {
+            mapper = reader.lines().collect(Collectors.joining("\n"));
+        }
+
+        String refundQuery = mapper.substring(
+                mapper.indexOf("<select id=\"getRefundList\""),
+                mapper.indexOf("<select id=\"chargingOrderGroup\""));
+        assertTrue(refundQuery.contains("WHERE re.refund_title = '特殊退款处理'"));
+        assertTrue(refundQuery.contains("<if test=\"data.specialRefund == null or !data.specialRefund\">"));
+    }
+
     private int countOccurrences(String text, String target) {
         int count = 0;
         int index = 0;

--
Gitblit v1.7.1