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/ShopShoppingCartDao.xml | 8 ++++----
1 files changed, 4 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 4cf0397..5f88fc6 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopShoppingCartDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopShoppingCartDao.xml
@@ -281,7 +281,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>
@@ -300,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>
@@ -361,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