From 3417384c42ef6e7d99e98cef4e3bb4a016cfedea Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 20:42:06 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 1246efe..7bf51be 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
@@ -1639,7 +1639,7 @@
     <select id="getMerOrderTotalOrderFrom" resultType="com.ruoyi.order.domain.vo.MerOrderTotalVo">
         SELECT
         COUNT(order_id) orderTotal,
-        IFNULL(SUM(CASE WHEN order_from = 1 THEN 1 ELSE 0 END),0) onlineTotal,
+        IFNULL(SUM(CASE WHEN order_from in (1,4,5,6,7) THEN 1 ELSE 0 END),0) onlineTotal,
         IFNULL(SUM(CASE WHEN order_from = 3 THEN 1 ELSE 0 END),0) offlineTotal,
         IFNULL(SUM(CASE WHEN order_from = 2 THEN 1 ELSE 0 END),0) activityTotal,
         IFNULL(SUM(CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END),0) orderMoney,
@@ -1750,6 +1750,10 @@
         WHEN 1 THEN "商城订单"
         WHEN 2 THEN "秒杀订单"
         WHEN 3 THEN "线下订单"
+        WHEN 4 THEN "抽奖"
+        WHEN 5 THEN "美团"
+        WHEN 6 THEN "抖音"
+        WHEN 7 THEN "快手"
         END mapKey,
         IFNULL(SUM(tog.goods_receivable_money),0) mapValue
         FROM t_order toc

--
Gitblit v1.7.1