From 3bf76788c2a9e4727896e73f10cda64a922c90d6 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 1 Jul 2024 13:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/artificer/OrdersDao.xml  | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml
index 7620c5f..ed162e0 100644
--- a/src/main/resources/mapper/artificer/OrdersDao.xml
+++ b/src/main/resources/mapper/artificer/OrdersDao.xml
@@ -1006,22 +1006,24 @@
 
 
     <select id="getDangqiList" resultType="com.sqx.modules.artificer.entity.Orders">
-        select * from orders
-        where status in (3,5)
-        and artificer_id = ${userId}
-        and end_times BETWEEN #{startTime} and #{endTime} and parent_id = 0
+        select a.*,b.massage_img from orders a
+        left join massage_type b on a.massage_type_id = b.massage_type_id
+        where a.status in (3,5)
+        and a.artificer_id = ${userId}
+        and a.end_times BETWEEN #{startTime} and #{endTime} and a.parent_id = 0
     </select>
 
     <select id="getJiazhongList" resultType="com.sqx.modules.artificer.entity.Orders">
-        select * from orders
-        where status in (3,5)
-        and artificer_id = ${userId}
-        and end_times BETWEEN #{startTime} and #{endTime} and parent_id = 0
+        select a.*,b.massage_img from orders a
+        left join massage_type b on a.massage_type_id = b.massage_type_id
+        where a.status in (3,5)
+        and a.artificer_id = ${userId}
+        and a.end_times BETWEEN #{startTime} and #{endTime} and a.parent_id = 0
         <if test="isSfwc != null and isSfwc == 0">
-            and (add_num = 0 or add_num is null)
+            and (a.add_num = 0 or a.add_num is null)
         </if>
         <if test="isSfwc != null and isSfwc == 1">
-            and add_num > 0
+            and a.add_num > 0
         </if>
     </select>
 
@@ -1043,10 +1045,11 @@
     </select>
     <!--    获取业绩积分-->
     <select id="getYjjfList" resultType="com.sqx.modules.artificer.entity.Orders">
-        select *,price as jifen,end_times as jftime  from orders
-        where status in (3,5)
-        and artificer_id = ${userId}
-        and end_times BETWEEN #{startTime} and #{endTime}
+        select a.*,a.price as jifen,a.end_times as jftime,b.massage_img  from orders a
+        left join massage_type b on a.massage_type_id = b.massage_type_id
+        where a.status in (3,5)
+        and a.artificer_id = ${userId}
+        and a.end_times BETWEEN #{startTime} and #{endTime}
     </select>
     <!--    获取储值积分（为他充值的）-->
     <select id="getCzjfList" resultType="com.sqx.modules.artificer.entity.Orders">