From 00efd2e4db8157ece4116c956c314803ed073042 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 03 Apr 2021 16:39:15 +0800
Subject: [PATCH] 会员中心手工调整积分

---
 zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml |   62 ++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 14 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..876d0a9 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
@@ -1,20 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <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}
-		<if test="record.revenueType==1">
-			and rec_num>0
-		</if>
-		<if test="record.revenueType==2">
-			<![CDATA[ and rec_num<0 ]]>
-		</if>
-		order by create_time desc
-	</select>
+
+    <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>
+
+            <if test="(record.userId!=null and record.userId!='') and (record.vipId!=null and record.vipId!='')">
+                and (a.open_id=#{record.userId} or a.vip_id=#{record.vipId})
+            </if>
+
+            <if test="(record.userId!=null and record.userId!='') and record.vipId==null">
+                and a.open_id=#{record.userId}
+            </if>
+
+            <if test="(record.vipId!=null and record.vipId!='') and record.userId==null">
+                and a.vip_id=#{record.vipId}
+            </if>
+
+            <if test="record.remarks!=null and record.remarks!=''">
+                and a.remarks like concat('%',#{record.remarks},'%')
+            </if>
+
+            <if test="record.queryTime!=null and record.queryTime!=''">
+                and DATE_FORMAT(a.create_time,'%Y-%m')=#{record.queryTime}
+            </if>
+
+            <if test="record.beginTime != null and record.endTime!=null">
+                and (date(a.create_time) between #{record.beginTime} and #{record.endTime})
+            </if>
+
+            <if test="record.revenueType==1">
+                and a.rec_num>0
+            </if>
+            <if test="record.revenueType==2">
+                <![CDATA[ and a.rec_num<0 ]]>
+            </if>
+        </where>
+        order by a.create_time desc
+
+    </select>
+
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1