From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 17 Jul 2021 15:59:10 +0800 Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距,和收银人 6. PC端服务单新增划扣金额展示 --- zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 9 +++++---- 1 files changed, 5 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..68afb0d 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> -- Gitblit v1.9.1