From 0c60f5608fc8f738eb138e32f583c329ed5aa81d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 14:46:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 b7b723e..5203a47 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -642,11 +642,11 @@
COMMISSION_ALL,IN_DATE,STAFF_ID,SHOP_ID,IS_DELETE,REMARK,PASSWORD,
EMAIL,CREATE_TIME,UUID,BALANCE,blood,sfCard,link,marry,vocation
from sys_vip_info
- where
- instr(PHONE,#{keyWord})
+ where company_id=#{companyId}
+ and (instr(PHONE,#{keyWord})
or instr(VIP_NAME ,#{keyWord})
or instr(zjm ,#{keyWord})
- or instr(VIP_NO ,#{keyWord})
+ or instr(VIP_NO ,#{keyWord}))
limit 0,15
</select>
@@ -1359,11 +1359,10 @@
e.shop_short_name shopName,
sum(IFNULL(b.gift_money, 0) + IFNULL(b.real_money, 0)) totalBalance,
sum(IFNULL(b.gift_money, 0)) giftBalance,
- sum(IFNULL(d.goods_cash, 0) + IFNULL(d.proj_cash, 0) + IFNULL(d.card_cash, 0)) totalShopping
+ (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
left join money_card_use b on a.ID = b.vip_id and b.status='有效'
left join sys_vip_level c on a.LEVEL_ID = c.ID
- left join achieve_new d on a.ID = d.vip_id
left join sys_shop_info e on a.SHOP_ID=e.ID
where a.ID=#{id}
</select>
--
Gitblit v1.9.1