From 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Wed, 13 Jan 2021 20:40:40 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 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 dc70747..0f64c0b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -538,6 +538,8 @@
where a.ID=#{id}
</select>
+
+
<!-- 根据手机和密码查询 -->
<select id="selectVipByPhonePassWord" resultMap="SysVipInfoMap">
<include refid="select"></include>
@@ -1262,7 +1264,8 @@
a.PHONE phone,
a.photo photo,
b.arriveCnt arriveCnt,
- g.shop_short_name shopName
+ g.shop_short_name shopName,
+ z.level_name vipLevel
from sys_vip_info a
left join (
select x.vip_id, count(1) arriveCnt from (
@@ -1280,6 +1283,7 @@
group by date_format(datatime, '%Y-%m-%d'), vip_id
) x group by x.vip_id
) b on a.ID=b.vip_id
+ left join sys_vip_level z on a.level_id=z.id
<!-- 本月消费 -->
<if test="record.sort == 'used'">
left join (
--
Gitblit v1.9.1