From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44:06 +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 | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 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 3f9fa59..47664d6 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
@@ -1,31 +1,22 @@
<?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.ScoreVipDetailDao">
<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 IFNULL(sum(IFNULL( remain_score, 0 )),0) from score_vip_detail
+ where state=1 and vip_id=#{vipId}
- <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>
+ </select>
+
+ <select id="selectEffectiveScore" resultType="com.matrix.system.score.entity.ScoreVipDetail">
+ select *
+ from score_vip_detail
+ where state = 1 and vip_id = #{vipId}
+ order by create_time
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1