From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml |   29 ++++++++++++++++++-----------
 1 files changed, 18 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 f8af810..c74f07c 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
@@ -291,6 +291,7 @@
         toc.order_no orderNo,
         toc.order_status orderStatus,
         toc.order_from orderFrom,
+        toc.activity_id aactivityId,
         toc.receivable_money receivableMoney,
         toc.goods_num goodsNum,
         toc.shop_id shopId,
@@ -368,6 +369,7 @@
         toc.order_remark orderRemark,
         toc.create_time createTime,
         toc.order_from orderFrom,
+        CASE toc.order_from WHEN 1 THEN '商城订单' WHEN 2 THEN CONCAT('平台秒杀活动(',toc.activity_name,')') WHEN 3 THEN '线下创建' END orderFromDesc,
         toc.activity_name activityName
         FROM t_order toc
         WHERE toc.del_flag = 0 AND toc.shop_id = #{param.shopId}
@@ -550,9 +552,9 @@
     <select id="totalOrderFirst" resultType="com.ruoyi.order.domain.vo.MgtOrderTotal">
         SELECT
         COUNT(temp.order_id) orderTotal,
-        IFNULL(SUM(temp.order_money),0) orderMoneyTotal
+        IFNULL(SUM(temp.change_receivable_money),0) orderMoneyTotal
         FROM
-        (SELECT toc.order_id,toc.order_money,toc.pay_money
+        (SELECT toc.order_id,toc.change_receivable_money,toc.pay_money
         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_from = 1 OR toc.order_from = 3)
@@ -583,9 +585,11 @@
     <select id="totalOrderSecond" resultType="com.ruoyi.order.domain.vo.MgtOrderTotal">
         SELECT
         COUNT(temp.order_id) shopOrderTotal,
-        IFNULL(SUM(temp.order_money),0) shopOrderMoneyTotal,
-        IFNULL(SUM(temp.pay_money),0) shopPayMoneyTotal FROM
-        (SELECT toc.order_id,toc.order_money,toc.pay_money
+        IFNULL(SUM(temp.change_receivable_money),0) shopOrderMoneyTotal,
+        IFNULL(SUM(temp.pay_money),0) shopPayMoneyTotal,
+        IFNULL(SUM(CASE WHEN temp.change_receivable_money &gt; temp.pay_money THEN temp.change_receivable_money - temp.pay_money ELSE 0 END),0) shopUnPayMoneyTotal
+        FROM
+        (SELECT toc.order_id,toc.change_receivable_money,toc.pay_money
         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_from = 1 OR toc.order_from = 3)
@@ -616,9 +620,11 @@
     <select id="totalOrderThird" resultType="com.ruoyi.order.domain.vo.MgtOrderTotal">
         SELECT
         COUNT(temp.order_id) activityOrderTotal,
-        IFNULL(SUM(temp.order_money),0) activityOrderMoneyTotal,
-        IFNULL(SUM(temp.pay_money),0) activityPayMoneyTotal FROM
-        (SELECT toc.order_id,toc.order_money,toc.pay_money
+        IFNULL(SUM(temp.change_receivable_money),0) activityOrderMoneyTotal,
+        IFNULL(SUM(temp.pay_money),0) activityPayMoneyTotal,
+        IFNULL(SUM(CASE WHEN temp.change_receivable_money &gt; temp.pay_money THEN temp.change_receivable_money - temp.pay_money ELSE 0 END),0)activityUnPayMoneyTotal
+        FROM
+        (SELECT toc.order_id,toc.change_receivable_money,toc.pay_money
         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_from = 2
@@ -871,7 +877,7 @@
             AND Date(toc.create_time) &lt;= #{param.endDate}
         </if>
         GROUP BY tog.goods_name
-        ORDER BY SUM(tog.goods_receivable_money) DESC LIMIT 10
+        ORDER BY SUM(tog.goods_receivable_money) DESC LIMIT 15
     </select>
 
     <select id="listTotalOrderTotalOrderFrom" resultType="com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo">
@@ -1775,7 +1781,7 @@
     <select id="getStaffActivityOrderTotal" resultType="com.ruoyi.order.domain.vo.StaffActivityOrderTotalVo">
         SELECT
             COUNT(DISTINCT toc.order_id) orderTotal,
-            IFNULL(SUM(SUM(CASE WHEN toc.order_status = 3 AND toc.pay_type = 1 THEN toc.change_receivable_money WHEN toc.order_status = 3 AND toc.pay_type = 2 THEN toc.change_receivable_money + toc.online_pay_money ELSE 0 END),0) orderMoney,
+            IFNULL(SUM(CASE WHEN toc.pay_type = 1 THEN toc.change_receivable_money WHEN toc.pay_type = 2 THEN toc.change_receivable_money + toc.online_pay_money ELSE 0 END),0) orderMoney,
             COUNT(DISTINCT toc.user_id) memberTotal
         FROM t_order toc
         WHERE toc.del_flag = 0 AND toc.shop_id = #{param.shopId} AND toc.order_from = 2 AND toc.order_status = 3
@@ -2067,7 +2073,8 @@
         toc.change_receivable_money - (CASE toc.pay_type WHEN 1 THEN toc.pay_money WHEN 2 THEN IFNULL(toc.offline_pay_money,0) END) unPaidMoney,
         toc.order_remark orderRemark,
         toc.create_time createTime,
-        toc.order_from orderFrom
+        toc.order_from orderFrom,
+        CASE toc.order_from WHEN 1 THEN '商城订单' WHEN 2 THEN CONCAT('平台秒杀活动(',toc.activity_name,')') WHEN 3 THEN '线下创建' END orderFromDesc
         FROM t_order toc
         WHERE toc.del_flag = 0 AND (toc.order_status = 2 OR toc.order_status = 3) AND toc.shop_id = #{param.shopId} AND toc.user_id = #{param.memberUserId}
         ORDER BY toc.create_time DESC

--
Gitblit v1.7.1