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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 df8f53f..3f9fa59 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml
@@ -18,7 +18,13 @@
</select>
<select id="selectEffectiveScore" resultType="com.matrix.system.score.entity.ScoreVipDetail">
- select * from score_vip_detail where open_id=#{openId} and state=1 order by create_time
+ 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>
--
Gitblit v1.9.1