From cb5b989e20e70a83183ad24bc8e22b8b6b6a19e8 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Fri, 16 Jun 2023 14:12:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=8E=A8=E5=B9=BF=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/recharge/RechargeOrderMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
index 9b671cedf..5055e3743 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
@@ -252,7 +252,7 @@
                 and b.nickname like CONCAT('%',#{data.nickname},'%')
             </if>
             <if test="data.realName !=null and data.realName!=''">
-                and x.real_name like CONCAT('%',#{data.realName},'%')
+                and x.nickname like CONCAT('%',#{data.realName},'%')
             </if>
             <if test="data.userPhone !=null and data.userPhone!=''">
                 and a.user_phone like CONCAT('%',#{data.userPhone},'%')

From 6be709216e9d4970656647d03c0e5e2deeca4919 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Fri, 16 Jun 2023 14:34:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=8E=A8=E5=B9=BF=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/order/StoreOrderMapper.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/order/StoreOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/order/StoreOrderMapper.xml
index dfb7aa5ac..2c43a9f54 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/order/StoreOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/order/StoreOrderMapper.xml
@@ -77,7 +77,7 @@
             `cy_recharge_order_info` info
                 LEFT JOIN cy_recharge_order ord ON info.recharge_order_id = ord.id
         WHERE
-            ord.paid = 1
+            ord.paid != 0
         <if test="null != startTime">
             and info.create_time >= #{startTime}
         </if>