From a17a3616fb0b59d61cda0f97c5005c18d97cdbee Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 22 Mar 2021 12:46:28 +0800
Subject: [PATCH] 积分商城13

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopShoppingCartDao.xml |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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..4cf0397 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,7 +276,8 @@
 		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
@@ -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

--
Gitblit v1.9.1