各类修复

longz

2026-07-30 c9189105ce555e260fb231bc34b9f0ec839fc570

各类修复

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -195,7 +195,7 @@
        a.app_user_id
        FROM
        charging_pile_order.t_charging_order a
        where (a.recharge_payment_status = 2 OR #{data.invoiceId} IS NOT NULL)
        where (a.recharge_payment_status = 2 OR a.status = -1 OR #{data.invoiceId} IS NOT NULL)

        UNION ALL


 ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/mapper/PayOrderQueryPerformanceMapperTest.java

@@ -51,7 +51,8 @@
                mapper.indexOf("<select id=\"payOrderQuery\""),
                mapper.indexOf("<select id=\"getRefundList\""));
        assertEquals(3, countOccurrences(payOrderQuery, "#{data.invoiceId} IS NOT NULL"));
        assertTrue(payOrderQuery.contains("a.recharge_payment_status = 2 OR #{data.invoiceId} IS NOT NULL"));
        assertTrue(payOrderQuery.contains(
                "a.recharge_payment_status = 2 OR a.status = -1 OR #{data.invoiceId} IS NOT NULL"));
        assertEquals(2, countOccurrences(payOrderQuery,
                "a.payment_status = 2 OR #{data.invoiceId} IS NOT NULL"));
    }