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/ScoreVipDetailDao.xml |   60 ++++++++++++++++++++++++------------------------------------
 1 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
index f7fe0c0..3f9fa59 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
@@ -3,41 +3,29 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.matrix.system.score.dao.ScoreVipDetailDao">
-	<!-- 定义ScoreVipDetail 的复杂关联map -->
-	<resultMap type="com.matrix.system.score.entity.ScoreVipDetail" id="ScoreVipDetailMap">
-		<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="type" column="type" />
-			<result property="allScore" column="all_score" />
-			<result property="usedScore" column="used_score" />
-			<result property="remainScore" column="remain_score" />
-			<result property="gainTime" column="gain_time" />
-			<result property="validiteTime" column="validite_time" />
-			<result property="state" column="state" />
-			<result property="businessId" column="business_id" />
-			<result property="companyId" column="company_id" />
-	</resultMap>
-	
-	
-	<!-- 定义ScoreVipDetail 的简单map  ,本map不添加其他的关联属性 -->
-	<resultMap type="com.matrix.system.score.entity.ScoreVipDetail" id="ScoreVipDetailSimpleMap">
-		<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="type" column="type" />
-			<result property="allScore" column="all_score" />
-			<result property="usedScore" column="used_score" />
-			<result property="remainScore" column="remain_score" />
-			<result property="gainTime" column="gain_time" />
-			<result property="validiteTime" column="validite_time" />
-			<result property="state" column="state" />
-			<result property="businessId" column="business_id" />
-			<result property="companyId" column="company_id" />
-	</resultMap>
+
+    <select id="selectUserTotalScore" resultType="java.lang.Integer">
+		select IFNULL(sum(IFNULL( remain_score, 0 )),0) from score_vip_detail
+		<where>
+		and state=1
+			<if test="openId !=null">
+				and open_id=#{openId}
+			</if>
+			<if test="vipId !=null">
+				and vip_id=#{vipId}
+			</if>
+		</where>
+	</select>
+
+	<select id="selectEffectiveScore" resultType="com.matrix.system.score.entity.ScoreVipDetail">
+		select  *  from score_vip_detail where state=1
+			<if test="openId !=null">
+			and open_id=#{openId}
+		</if>
+			<if test="vipId !=null">
+				and vip_id=#{vipId}
+			</if>  order by create_time
+
+	</select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1