From 2d99981eeb97ba982db9cbbdb4e6d18471a22e46 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 22 Mar 2021 10:12:47 +0800
Subject: [PATCH] 积分商城10

---
 zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
index ab3d85e..cb50621 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
@@ -4,17 +4,27 @@
 
 <mapper namespace="com.matrix.system.score.dao.ScoreUseRecordDao">
 
-    <select id="selectFlowList" resultType="com.matrix.system.score.entity.ScoreUseRecord">
-		select * from score_use_record
-		where open_id=#{record.userId}
-		and DATE_FORMAT(create_time,'%Y-%m')=#{record.queryTime}
+
+	<select id="selectFlowList" resultType="com.matrix.system.shopXcx.api.vo.ScoreUseRecordVo">
+
+		select a.*,
+		b.SHOP_NAME,
+		c.su_name as optionName
+		from score_use_record a
+		left join sys_shop_info b on a.shop_id=b.id
+		left join sys_users c on a.opration_user_id=c.su_id
+		where a.open_id=#{record.userId}
+		and DATE_FORMAT(a.create_time,'%Y-%m')=#{record.queryTime}
 		<if test="record.revenueType==1">
-			and rec_num>0
+			and a.rec_num>0
 		</if>
 		<if test="record.revenueType==2">
-			<![CDATA[ and rec_num<0 ]]>
+			<![CDATA[ and a.rec_num<0 ]]>
 		</if>
-		order by create_time desc
+		order by a.create_time desc
+
 	</select>
 
+
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1