From de36af8c1f927cf8ba543f8eb1f0a7f2ed7fffb7 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Wed, 21 Aug 2024 10:59:41 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E5=A4=8DmerchantName?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gxwebsoft/shop/mapper/xml/OrderPayMapper.xml  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderPayMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderPayMapper.xml
index 86d8386..f107c0d 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderPayMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderPayMapper.xml
@@ -4,7 +4,10 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,b.real_name,c.equipment_name,c.battery_model,d.merchant_name
+        SELECT a.*,
+        b.real_name,c.equipment_name,c.battery_model,
+        c.equipment_code,
+        d.merchant_name as merchantName,d.merchant_code
         FROM shop_order_pay a
         LEFT JOIN sys_user b ON a.user_id = b.user_id
         LEFT JOIN apps_equipment c ON a.equipment_id = c.equipment_id
@@ -25,7 +28,7 @@
             <if test="param.merchantCode != null">
                 AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
             </if>
-            <if test="param.createTimeStart != null">
+           <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>
             <if test="param.createTimeEnd != null">