From c41e8d372cdabbe1fd5973c9322e38a40bfa1a39 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Thu, 05 May 2022 15:50:07 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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..2e2de04 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>
@@ -350,11 +353,12 @@
c.name as goodsName,
g.name as cateName,
a.COUNT,
+ a.COUNT * a.ZK_PRICE as total,
a.refundCount,
a.ZK_PRICE,
a.IS_FREE,
a.pay_method,
- a.status
+ b.statu
from sys_order_item a
left join sys_order b on a.ORDER_ID=b.ID
left join shopping_goods c on a.goods_id=c.id
@@ -394,8 +398,8 @@
<if test="guwenId != null and guwenId != '' ">
and b.STAFF_ID=#{guwenId}
</if>
- <if test="status != null and status != '' ">
- and a.status=#{status}
+ <if test="statu != null and statu != '' ">
+ and b.statu=#{statu}
</if>
</where>
@@ -446,8 +450,8 @@
<if test="guwenId != null and guwenId != '' ">
and b.STAFF_ID=#{guwenId}
</if>
- <if test="status != null and status != '' ">
- and a.status=#{status}
+ <if test="statu != null and statu != '' ">
+ and b.statu=#{statu}
</if>
</where>
</select>
--
Gitblit v1.9.1