From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 21 八月 2023 19:03:55 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index b1dc538..0010e74 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -132,7 +132,7 @@
<result column="orderFrom" property="orderFrom"/>
<result column="shopId" property="shopId"/>
<result column="verifyTime" property="verifyTime"/>
- <collection property="mgtOrderGoodsVoList"
+ <collection property="mgtOrderGoodsPageVoList"
ofType="com.ruoyi.order.domain.vo.MgtOrderGoodsPageVo"
select="listAllSimpleOrderGoodsByOrderId"
column="{orderId=orderId}">
@@ -151,7 +151,7 @@
<result column="payMoney" property="payMoney"/>
<result column="orderFrom" property="orderFrom"/>
<result column="orderStatus" property="orderStatus"/>
- <collection property="mgtOrderGoodsVoList"
+ <collection property="mgtOrderGoodsPageVoList"
ofType="com.ruoyi.order.domain.vo.MgtOrderGoodsPageVo"
select="listAllSimpleOrderGoodsByOrderId"
column="{orderId=orderId">
@@ -455,8 +455,6 @@
toc.receivable_money receivableMoney,
toc.pay_money payMoney,
toc.change_receivable_money receiveMoney,
- tog.goods_name goodsName,
- tog.buy_num buyNum,
toc.create_time createTime,
toc.order_from orderFrom,
CASE toc.order_from
@@ -776,7 +774,7 @@
IFNULL(SUM(CASE WHEN tog.goods_type = 2 THEN tog.goods_receivable_money ELSE 0 END),0) serviceMoney
FROM t_order toc
INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
- WHERE toc.del_flag = 0 AND order_status IN (2,3)
+ WHERE toc.del_flag = 0 AND order_status = 3
<if test="param.shopId != null and param.shopId != ''">
AND toc.shop_id = #{param.shopId}
</if>
@@ -1380,9 +1378,17 @@
<select id="getMerHomeShopTotalVo" resultType="com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo">
SELECT
IFNULL(SUM(CASE WHEN order_status = 2 THEN 1 ELSE 0 END),0) unHandleOrder,
- IFNULL(SUM(change_receivable_money),0) shopTurnover
+ IFNULL(SUM(CASE WHEN order_status = 3 THEN change_receivable_money ELSE 0 END),0) shopTurnover
FROM t_order
WHERE del_flag = 0 AND shop_id = #{shopId} AND order_status IN (2,3)
+ </select>
+
+ <select id="getMerHomeShopServiceTotalVo" resultType="com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo">
+ SELECT
+ COUNT(DISTINCT CASE WHEN goods_type = 1 THEN user_id END) cycleSurp,
+ COUNT(DISTINCT CASE WHEN goods_type = 3 THEN user_id END) explorationSurp
+ FROM t_consumer_goods
+ WHERE del_flag = 0 AND shop_id = #{shopId} AND cycle_num_flag = 1 AND service_status = 1
</select>
<select id="getMerHomeShopsTotalVo" resultType="com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo">
@@ -1416,7 +1422,7 @@
IFNULL(SUM(CASE WHEN order_from = 1 THEN change_receivable_money ELSE 0 END),0) onlineMoney,
IFNULL(SUM(CASE WHEN order_from = 3 THEN change_receivable_money ELSE 0 END),0) offlineMoney,
IFNULL(SUM(CASE WHEN order_from = 2 THEN change_receivable_money ELSE 0 END),0) activityMoney
- FROM t_order WHERE del_flag = 0 AND order_status IN (2,3)
+ FROM t_order WHERE del_flag = 0 AND order_status = 3
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -1442,7 +1448,7 @@
SUM(tog.goods_receivable_money) AS mapValueSecond
FROM t_order toc
INNER JOIN t_order_goods tog ON toc.order_id = tog.order_id
- WHERE toc.del_flag = 0 AND toc.order_status IN (2,3) AND tog.del_flag = 0 AND tog.goods_type = #{param.goodsType}
+ WHERE toc.del_flag = 0 AND toc.order_status = 3 AND tog.del_flag = 0 AND tog.goods_type = #{param.goodsType}
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -1463,7 +1469,7 @@
IFNULL(SUM(tog.goods_receivable_money),0) AS mapValueSecond
FROM t_order toc
INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
- WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
+ WHERE toc.del_flag = 0 AND toc.order_status = 3
<if test="param.shopId != null and param.shopId != ''">
AND toc.shop_id = #{param.shopId}
</if>
@@ -1488,7 +1494,7 @@
IFNULL(SUM(tog.goods_receivable_money),0) mapValue
FROM t_order toc
INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
- WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
+ WHERE toc.del_flag = 0 AND toc.order_status = 3
<if test="param.goodsType != null and param.goodsType != ''">
AND tog.goods_type = #{param.goodsType}
</if>
@@ -1520,7 +1526,7 @@
END mapKey,
IFNULL(SUM(toc.order_money),0) mapValue
FROM t_order toc
- WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
+ WHERE toc.del_flag = 0 AND toc.order_status = 3
<if test="param.goodsType != null and param.goodsType != ''">
AND tog.goods_type = #{param.goodsType}
</if>
--
Gitblit v1.7.1