From a0a9ed6e00121433deb5a941fa7e34b671cbf8de Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Fri, 16 Jan 2026 10:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E7=82=AC=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ShouJuStatisticsService.java        |  7 +++++++
 .../resources/mapper/ShouJuStatisticsMapper.xml | 17 +++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java
index 1395b43..d27ad29 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java
@@ -197,6 +197,12 @@ public class ShouJuStatisticsService implements StatisticsService {
             log.error("订单动态数据获取失败", ex);
             return 0D;
         });
+        CompletableFuture<Double> total_disposeWeight = CompletableFuture.supplyAsync(() -> {
+            return statisticsMapper.disposeWeight(null, null);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return 0D;
+        });
         CompletableFuture<Double> yesterday_disposeWeight = CompletableFuture.supplyAsync(() -> {
             DateTime yesterday = DateUtil.offsetDay(date, -1);
             long yesterday_start = DateUtil.beginOfDay(yesterday).getTime() / 1000;
@@ -388,6 +394,7 @@ public class ShouJuStatisticsService implements StatisticsService {
                 .put("yearAmountIn", yearAmount_.get_0())
                 .put("yearAmountOut", yearAmount_.get_1())
                 .put("chuzhi", map2)
+                .put("totaDisposeWeight", total_disposeWeight.get())
                 .build();
     }
 
diff --git a/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml
index 518f15c..a24fe01 100644
--- a/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml
@@ -130,12 +130,17 @@
     <select id="disposeWeight" resultType="java.lang.Double">
         SELECT IFNULL(SUM(a.weight), 0) weight
         FROM ba_order a
-                 INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 1 AND b.category_id IN (51, 47) AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2)
-        WHERE a.create_time >= #{startTime}
-          AND a.create_time <![CDATA[ <= ]]> #{endTime}
-          AND a.type != 4
-          AND a.finish = 1
-          AND a.status = 1
+        INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 1 AND b.category_id IN (51, 47) AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2)
+
+        <where>
+            <if test="startTime != null and endTime != null">
+                AND a.create_time >= #{startTime}
+                AND a.create_time <![CDATA[ <= ]]> #{endTime}
+            </if>
+            AND a.type != 4
+            AND a.finish = 1
+            AND a.status = 1
+        </where>
     </select>
     <select id="getTodayOrderSummary" resultType="com.njzscloud.supervisory.statistics.pojo.TodayOrderSummary">
         SELECT MAX(IF(order_status = '已完成', order_count, 0)) completed,