From 5b5b38441c55eddcdeb74e2a3b096536c8ebf37b Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 18 Jan 2021 00:10:32 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml |    9 ++++++++-
 1 files changed, 8 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..d29ea9e 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 (
@@ -1316,6 +1320,9 @@
         <if test="record.shopId != null">
             and a.shop_id=#{record.shopId}
         </if>
+        <if test="record.companyId != null">
+            and a.company_id=#{record.companyId}
+        </if>
         <if test='record.birthType=="1"'>
             and a.BIRTHDAY1 between curdate() and DATE_ADD(CURDATE(), INTERVAL 3 DAY)
         </if>

--
Gitblit v1.9.1