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/OnlinebookingDao.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/OnlinebookingDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/OnlinebookingDao.xml
index a60b9d8..4bb2b75 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/OnlinebookingDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/OnlinebookingDao.xml
@@ -17,7 +17,7 @@
<result property="staffId" column="staff_id" />
<result property="vipName" column="vip_name" />
<result property="tel" column="tel" />
- <result property="bizUserId" column="sys_vip_info_id" />
+ <result property="bizUserId" column="biz_user_id" />
<result property="formId" column="form_id" />
<result property="productId" column="product_id" />
@@ -42,7 +42,7 @@
<result property="staffId" column="staff_id" />
<result property="vipName" column="vip_name" />
<result property="tel" column="tel" />
- <result property="bizUserId" column="sys_vip_info_id" />
+ <result property="bizUserId" column="biz_user_id" />
<result property="productId" column="product_id" />
<result property="orderNo" column="order_no" />
<result property="formId" column="form_id" />
@@ -66,7 +66,7 @@
staff_id,
vip_name,
tel,
- sys_vip_info_id,
+ biz_user_id,
product_id,
order_no,
form_id
@@ -129,7 +129,7 @@
tel = #{tel},
</if>
<if test="(bizUserId!=null and bizUserId!='') or (bizUserId!='' and bizUserId==0)">
- sys_vip_info_id = #{bizUserId},
+ biz_user_id = #{bizUserId},
</if>
<if test="(productId!=null and productId!='') or (productId!='' and productId==0)">
product_id = #{productId},
@@ -199,7 +199,7 @@
staff_id,
vip_name,
tel,
- sys_vip_info_id,
+ biz_user_id,
product_id,
order_no,
form_id,
@@ -303,7 +303,7 @@
staff_id,
vip_name,
tel,
- sys_vip_info_id,
+ biz_user_id,
product_id
from onlinebooking
where 1=1
@@ -417,7 +417,7 @@
staff_id,
vip_name,
tel,
- sys_vip_info_id,
+ biz_user_id,
product_id,
order_no
from onlinebooking
@@ -442,7 +442,7 @@
staff_id,
vip_name,
tel,
- sys_vip_info_id,
+ biz_user_id,
product_id
from onlinebooking
where 1=1
@@ -495,7 +495,7 @@
staff_id,
vip_name,
tel,
- sys_vip_info_id,
+ biz_user_id,
product_id,
order_no
from onlinebooking
@@ -547,7 +547,7 @@
staff_id,
vip_name,
tel,
- sys_vip_info_id,
+ biz_user_id,
product_id,
order_no,
form_id,
@@ -565,7 +565,7 @@
and vip_Id = #{record.vipId}
</if>
<if test="(record.bizUserId!=null and record.bizUserId!='') or (record.bizUserId!='' and record.bizUserId==0)">
- and sys_vip_info_id = #{record.bizUserId}
+ and biz_user_id = #{record.bizUserId}
</if>
<if test="(record.time!=null and record.time!='') or (record.time!='' and record.time==0)">
and time = #{record.time}
@@ -611,7 +611,7 @@
and vip_Id = #{record.vipId}
</if>
<if test="(record.bizUserId!=null and record.bizUserId!='') or (record.bizUserId!='' and record.bizUserId==0)">
- and sys_vip_info_id = #{record.bizUserId}
+ and biz_user_id = #{record.bizUserId}
</if>
<if test="(record.time!=null and record.time!='') or (record.time!='' and record.time==0)">
and time = #{record.time}
--
Gitblit v1.9.1