From e11162164d7b136e9de4c4b2e378b108cd87859f Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into developer
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
index bbf480c..91d9aa6 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -1386,7 +1386,7 @@
select x.vip_id, count(1) arriveCnt from (
select vip_id, date_format(datatime, '%Y-%m-%d')
from achieve_new
- where 1=1 and (a.IS_DELETE is null or a.IS_DELETE = '')
+ where 1=1
<!-- 本月到店次数 -->
<if test="record.sort == 'monthArrived'">
and date_format(curdate(), '%Y-%m') = date_format(datatime, '%Y-%m')
@@ -1425,7 +1425,7 @@
</if>
left join sys_shop_info g on a.shop_id = g.id
left join sys_vip_level h on a.level_id=h.id
- where 1=1
+ where 1=1 and (a.IS_DELETE is null or a.IS_DELETE = '')
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(PHONE,#{record.queryKey})
or instr(VIP_NAME ,#{record.queryKey})
--
Gitblit v1.9.1