From f83b62252df79afbfa19f4cf1be0487d9e37a123 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 18:48:09 +0800
Subject: [PATCH] 20220505

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml |   11 ++++++++++-
 1 files changed, 10 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 dd2ef97..efbcb82 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -61,6 +61,7 @@
         <result property="country" column="country" />
         <result property="sessionKey" column="session_key" />
         <result property="userIsAuthorize" column="user_is_authorize" />
+        <result property="validFlag" column="valid_flag" />
 
         <!-- 扩展属性 -->
         <result property="staffName" column="STAFF_NAME"/>
@@ -124,6 +125,7 @@
         <result property="country" column="country" />
         <result property="sessionKey" column="session_key" />
         <result property="userIsAuthorize" column="user_is_authorize" />
+        <result property="validFlag" column="valid_flag" />
 
         <!-- 扩展属性 -->
         <result property="staffName" column="STAFF_NAME"/>
@@ -537,6 +539,9 @@
             <if test="avatarUrl != null and avatarUrl != '' ">
                 avatar_url  = #{avatarUrl},
             </if>
+            <if test="validFlag != null and validFlag != '' ">
+                valid_flag  = #{validFlag},
+            </if>
 
 
         </set>
@@ -802,6 +807,10 @@
             </if>
             <if test="record.phone != null and record.phone !='' ">
                 and a.PHONE like CONCAT('%',#{record.phone},'%')
+            </if>
+            <if test="record.padQueryKey != null and record.padQueryKey !='' ">
+                and (a.PHONE like CONCAT('%',#{record.padQueryKey},'%')
+                 or instr(a.VIP_NAME ,#{record.padQueryKey}) )
             </if>
             <if test="record.sex != null and record.sex !='' ">
                 and a.SEX = #{record.sex}
@@ -1461,7 +1470,7 @@
                c.LEVEL_NAME vipLevel,
                a.POINT_ALL integral,
                e.shop_short_name shopName,
-               sum(IFNULL(b.gift_money, 0)) totalBalance,
+               sum(IFNULL(b.real_money, 0)) totalBalance,
                sum(IFNULL(b.gift_money, 0)) giftBalance,
                (select sum(IFNULL(d.goods_cash, 0) + IFNULL(d.proj_cash, 0) + IFNULL(d.card_cash, 0)) from achieve_new d where d.vip_id=a.id) totalShopping
         from sys_vip_info a

--
Gitblit v1.9.1