From b0c5d432ec041221dcbe81ca5ae3aa20fe3bddc6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Mar 2021 20:17:58 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml | 59 +++++++++++++++++++++++------------------------------------
1 files changed, 23 insertions(+), 36 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 ca3b694..cb50621 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
@@ -3,41 +3,28 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.matrix.system.score.dao.ScoreUseRecordDao">
- <!-- 定义ScoreUseRecord 的复杂关联map -->
- <resultMap type="com.matrix.system.score.entity.ScoreUseRecord" id="ScoreUseRecordMap">
- <id property="id" column="id" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="recType" column="rec_type" />
- <result property="recNum" column="rec_num" />
- <result property="businessId" column="business_id" />
- <result property="scoreVipDetailId" column="score_vip_detail_id" />
- <result property="preScore" column="pre_score" />
- <result property="nowScore" column="now_score" />
- <result property="userId" column="user_id" />
- <result property="remarks" column="remarks" />
- <result property="companyId" column="company_id" />
- </resultMap>
-
-
- <!-- 定义ScoreUseRecord 的简单map ，本map不添加其他的关联属性 -->
- <resultMap type="com.matrix.system.score.entity.ScoreUseRecord" id="ScoreUseRecordSimpleMap">
- <id property="id" column="id" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="recType" column="rec_type" />
- <result property="recNum" column="rec_num" />
- <result property="businessId" column="business_id" />
- <result property="scoreVipDetailId" column="score_vip_detail_id" />
- <result property="preScore" column="pre_score" />
- <result property="nowScore" column="now_score" />
- <result property="userId" column="user_id" />
- <result property="remarks" column="remarks" />
- <result property="companyId" column="company_id" />
- </resultMap>
+
+
+ <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 a.rec_num>0
+ </if>
+ <if test="record.revenueType==2">
+ <![CDATA[ and a.rec_num<0 ]]>
+ </if>
+ order by a.create_time desc
+
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1