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/xcxShop/ShopInvoiceDao.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopInvoiceDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopInvoiceDao.xml
index 15b7e08..fadeb51 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopInvoiceDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopInvoiceDao.xml
@@ -366,7 +366,7 @@
 		FROM
 		shop_invoice i
 		LEFT JOIN shop_order o ON i.order_id = o.id
-		LEFT JOIN biz_user b on i.user_id = b.open_id
+		LEFT JOIN sys_vip_info b on i.user_id = b.id
 		<where>
 		  <include refid="where_sql"></include>
 		 </where>
@@ -385,7 +385,7 @@
 		FROM
 		shop_invoice i
 		LEFT JOIN shop_order o ON i.order_id = o.id
-		LEFT JOIN biz_user b on i.user_id = b.open_id
+		LEFT JOIN sys_vip_info b on i.user_id = b.id
 		<where>
 		   <include refid="where_sql"></include>
 		</where>
@@ -419,7 +419,7 @@
 		FROM
 		shop_invoice i
 		LEFT JOIN shop_order o ON i.order_id = o.id
-		LEFT JOIN biz_user b on i.user_id = b.open_id
+		LEFT JOIN sys_vip_info b on i.user_id = b.id
 		where  invo_id=#{invoId} 
 	</select>	
 	

--
Gitblit v1.9.1