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/ShopCollectionDao.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml
index 1ed2da7..e55332e 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml
@@ -32,7 +32,7 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="userName" column="user_name" />
 			<result property="nickName" column="nick_name" />
-			<result property="phoneNumber" column="phone_number" />
+			<result property="phoneNumber" column="phone" />
 		<result property="companyId" column="company_id" />
 	</resultMap>
 	
@@ -215,10 +215,10 @@
 		c.coll_productid,
 		u.user_name,
 		u.nick_name,
-		u.phone_number,
+		u.phone,
 		p.title
 		from shop_collection c
-		LEFT JOIN biz_user u ON c.coll_userid = u.open_id
+		LEFT JOIN sys_vip_info u ON c.coll_userid = u.id
 		LEFT JOIN shop_product p ON c.coll_productid = p.id
 		<where>
 		  <include refid="where_sql"></include>
@@ -236,7 +236,7 @@
 	<select id="selectTotalRecord" parameterType="long"   resultType="java.lang.Integer">
 	select count(*)
 	from shop_collection c
-		LEFT JOIN biz_user u ON c.coll_userid = u.open_id
+		LEFT JOIN sys_vip_info u ON c.coll_userid = u.id
 		LEFT JOIN shop_product p ON c.coll_productid = p.id
 		<where>
 		   <include refid="where_sql"></include>

--
Gitblit v1.9.1