From c5e6a16b70b5d119428fd621bfc2871a94c89d30 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 17 Sep 2021 16:45:39 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 9437453..4c304c9 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -499,9 +499,7 @@
<if test="isDeal != null ">
is_deal = #{isDeal},
</if>
- <if test="recommendId != null ">
- recommend_id = #{recommendId},
- </if>
+
<if test="province != null and province !='' ">
province = #{province},
</if>
@@ -551,6 +549,9 @@
<update id="unbundlingSaleMan">
UPDATE sys_vip_info set recommend_id = NULL where id=#{userId};
+ </update>
+ <update id="bindingRecommend">
+ UPDATE sys_vip_info set recommend_id = #{recommendId} where id=#{userId};
</update>
<!-- 批量删除 -->
@@ -1207,7 +1208,7 @@
<select id="selectByPhone" resultMap="SysVipInfoMapSimple">
- select * from sys_vip_info where PHONE = #{phone}
+ select * from sys_vip_info where PHONE = #{phone} and company_id=#{companyId}
</select>
@@ -1360,6 +1361,7 @@
select
a.ID id,
a.VIP_NAME vipName,
+ a.VIP_NO vipNo,
a.PHONE phone,
a.photo photo,
b.arriveCnt arriveCnt,
--
Gitblit v1.9.1