From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 09:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml
index b03d791..94d6c2d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml
@@ -517,9 +517,9 @@
and c.shop_id =#{shopId}
</if>
<if test="vipQueryKey != null and vipQueryKey != '' ">
- and e.VIP_NAME like concat('%',#{vipQueryKey},'%')
- or (e.VIP_NO like concat('%',#{vipQueryKey},'%')
- or e.PHONE like concat('%',#{vipQueryKey},'%')
+ and c.VIP_NAME like concat('%',#{vipQueryKey},'%')
+ or (c.VIP_NO like concat('%',#{vipQueryKey},'%')
+ or c.PHONE like concat('%',#{vipQueryKey},'%')
)
</if>
<if test="goodsName != null and goodsName != '' ">
@@ -616,4 +616,8 @@
</select>
+ <select id="selectHasValidMoneyCardUse" resultMap="MoneyCardUseSimpleMap">
+ select * from money_card_use
+ where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') and STATUS='有效'
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1