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/ShopOrderV2Dao.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderV2Dao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderV2Dao.xml
index 04cba28..a282ab6 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderV2Dao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderV2Dao.xml
@@ -5,20 +5,21 @@
<mapper namespace="com.matrix.system.shopXcx.dao.ShopOrderV2Dao">
<select id="selectReceivedOrderCount" resultType="java.lang.Integer">
- select count(*) from shop_order where user_id = #{openId} and order_status in (4,5)
+ select count(*) from shop_order where user_id = #{userId} and order_status in (4,5)
</select>
<select id="countOrderAmount" resultType="java.lang.Double">
- select IFNULL(sum(IFNULL( order_money, 0 )),0) from shop_order where user_id = #{openId} and order_status in (4,5)
+ select IFNULL(sum(IFNULL( order_money, 0 )),0) from shop_order where user_id = #{userId} and order_status in (4,5)
</select>
<select id="countBuyZdcp" resultType="java.lang.Integer">
select count(*) from shop_order a
left join shop_order_details b on a.id=b.order_id
- where a.user_id=#{openId}
+ where a.user_id=#{userId}
and order_status in (4,5)
and find_in_set(b.p_id,#{productIds})
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1