From 5bbf4535f43dcae1f308b0f36c65a63ab79a4fdb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 09:04:01 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 45f9f74..ed930b2 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -933,7 +933,7 @@
             from t_charging_order
             where 1=1
         AND  del_flag = 0
-        AND recharge_payment_status = 2
+        AND recharge_payment_status = 2 and status = 5
             <if test="siteIds != null and siteIds.size() > 0">
                 and site_id IN
                 <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">

--
Gitblit v1.7.1