From 85dce973eb29eb2372c76d5b95b30354da9c41c8 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:08:51 +0800
Subject: [PATCH] fead:新增收银员字段

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopShoppingCartDao.xml |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopShoppingCartDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopShoppingCartDao.xml
index 271fc01..5f88fc6 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopShoppingCartDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopShoppingCartDao.xml
@@ -27,6 +27,7 @@
 		    <result property="isSelected" column="isSelected" />
 		    <result property="shopId" column="shop_id" />
 		<result property="companyId" column="company_id" />
+		<result property="cartType" column="cart_type" />
 	</resultMap>
 	
 	
@@ -44,6 +45,7 @@
 		<result property="isSelected" column="isSelected" />
 		<result property="shopId" column="shop_id" />
 		<result property="companyId" column="company_id" />
+		<result property="cartType" column="cart_type" />
 
 	</resultMap>
 	
@@ -60,7 +62,8 @@
 			cart_number,
 			isSelected,
 			shop_id,
-            company_id
+            company_id,
+		cart_type
 
 	</sql>
 	
@@ -77,7 +80,8 @@
 			#{item.cartNumber},
 			#{item.isSelected},
 			#{item.shopId},
-		#{item.companyId}
+		#{item.companyId},
+		#{item.cartType}
 
 	</sql>
 	
@@ -272,11 +276,12 @@
 		p.img_mobile,
 		p.img_pc,
 		u.nick_name,
-		s.NAME
+		s.NAME,
+		    c.cart_type,
 		from shop_shopping_cart c
 		LEFT JOIN shop_product p ON c.cart_product_id = p.id
 		LEFT JOIN shop_sku s ON c.cart_sku_id = s.id
-		LEFT JOIN biz_user u ON c.cart_user_id = u.open_id
+		LEFT JOIN sys_vip_info u ON c.cart_user_id = u.id
 		<where>
 		  <include refid="where_sql"></include>
 		 </where>
@@ -295,7 +300,7 @@
 	from shop_shopping_cart c
 		LEFT JOIN shop_product p ON c.cart_product_id = p.id
 		LEFT JOIN shop_sku s ON c.cart_sku_id = s.id
-		LEFT JOIN biz_user u ON c.cart_user_id = u.open_id
+		LEFT JOIN sys_vip_info u ON c.cart_user_id = u.id
 		<where>
 		   <include refid="where_sql"></include>
 		</where>
@@ -329,7 +334,10 @@
 			p.img_pc,
 			p.buy_limit,
 			s.NAME,
-			s.stock
+			s.stock,
+			s.score_count,
+			s.score_price,
+		       c.cart_type
 		from shop_shopping_cart c
 		LEFT JOIN shop_product p ON c.cart_product_id = p.id
 		LEFT JOIN shop_sku s ON c.cart_sku_id = s.id
@@ -353,9 +361,9 @@
 
 	<!-- 统计用户购物车数量 -->
 	<select id="selectUserCartCount" resultType="java.lang.Integer" >
-		select sum(cart_number) from shop_shopping_cart  c
+		select ifnull(sum(cart_number),0) from shop_shopping_cart  c
 LEFT JOIN shop_product p on p.id = c.cart_product_id
-where c.shop_Id=#{shopId} and  p.del_flag = 2 and cart_user_id=#{openId}
+where c.shop_Id=#{shopId} and  p.del_flag = 2 and cart_user_id=#{userId}
 	</select>
 
 	<!-- 根据id 锁表查询-->

--
Gitblit v1.9.1