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/hive/SysOrderItemDao.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
index 6c658ad..a3b0cd3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
@@ -275,10 +275,13 @@
     </select>
     <!-- 根据商品id查询改商品下单次数总和-->
     <select id="selectByGoodsId" resultType="java.lang.Integer">
-	    select sum(COUNT) from sys_order_item a
+	    select IFNULL(sum(COUNT),0) AS total from sys_order_item a
 	    left join  sys_order b on b.ID=a.ORDER_ID
-	    where a.GOODS_ID = #{goodsId} 
-	    and b.STATU !='已取消'
+	    where a.GOODS_ID = #{goodsId}
+	    <if test="vipId != null">
+            and b.vip_id=#{vipId}
+        </if>
+	    and b.STATU ='已付款'
 	</select>
 
 

--
Gitblit v1.9.1