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/score/ScoreUseRecordDao.xml | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
index 876d0a9..b8a1a41 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/score/ScoreUseRecordDao.xml
@@ -15,15 +15,7 @@
left join sys_users c on a.opration_user_id=c.su_id
<where>
- <if test="(record.userId!=null and record.userId!='') and (record.vipId!=null and record.vipId!='')">
- and (a.open_id=#{record.userId} or a.vip_id=#{record.vipId})
- </if>
-
- <if test="(record.userId!=null and record.userId!='') and record.vipId==null">
- and a.open_id=#{record.userId}
- </if>
-
- <if test="(record.vipId!=null and record.vipId!='') and record.userId==null">
+ <if test="(record.vipId!=null and record.vipId!='')">
and a.vip_id=#{record.vipId}
</if>
--
Gitblit v1.9.1