From 39b818f69889399ba5644cf148be59ae5ff4472e Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Wed, 8 Oct 2025 19:53:10 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1=E6=A1=A3=E5=8F=A3?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E6=95=B0=E6=8D=AE=E3=80=81=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E6=95=B0=E6=8D=AE=E3=80=81=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E6=95=B0=E6=8D=AE=E8=B0=83=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/quartz/DailySaleCustomerMapper.xml | 14 +++++------
 .../mapper/quartz/DailySaleMapper.xml         | 24 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml
index 8bb5a2c4e..8e6f3c6b5 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleCustomerMapper.xml
@@ -6,21 +6,19 @@
 
     <select id="selectDailySale" resultType="com.ruoyi.xkt.dto.dailySale.DailySaleCusDTO">
         SELECT
-            ss.store_id,
-            ss.store_cus_id,
+            ssd.store_id,
+            ssd.store_cus_id,
             COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.amount ELSE 0 END ), 0 ) AS saleAmount,
             COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END ), 0 ) AS refundAmount,
             COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.quantity ELSE 0 END ), 0 ) AS saleNum,
             COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END ), 0 ) AS refundNum
         FROM
-            store_sale ss
-                LEFT JOIN store_sale_detail ssd ON ss.id = ssd.store_sale_id
+            store_sale_detail ssd
         WHERE
-            ss.del_flag = 0
-          AND ss.voucher_date = #{voucherDate}
+            ssd.del_flag = 0 AND ss.voucher_date = #{voucherDate}
         GROUP BY
-            ss.store_id,
-            ss.store_cus_id
+            ssd.store_id,
+            ssd.store_cus_id
     </select>
 
     <select id="selectTop10SaleCustomerList" resultType="com.ruoyi.xkt.dto.store.StoreIndexCusSaleTop10ResDTO">
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml
index 0a1f499fc..aa4d496a4 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml
@@ -6,21 +6,21 @@
 
     <select id="selectDailySale" resultType="com.ruoyi.xkt.dto.dailySale.DailySaleDTO">
         SELECT
-            ss.store_id,
-            COALESCE(SUM(CASE WHEN ssd.sale_type = 1 THEN ssd.amount ELSE 0 END), 0) AS saleAmount,
-            COALESCE(SUM(CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END), 0) AS refundAmount,
-            COALESCE(SUM(CASE WHEN ssd.sale_type = 1 THEN ssd.quantity ELSE 0 END), 0) AS saleNum,
-            COALESCE(SUM(CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END), 0) AS refundNum,
-            COALESCE(COUNT(ss.store_cus_id), 0) AS customerNum,
-            COALESCE(SUM(sps.quantity), 0) AS storageNum
+            ssd.store_id,
+            COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.amount ELSE 0 END ), 0 ) AS saleAmount,
+            COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END ), 0 ) AS refundAmount,
+            COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.quantity ELSE 0 END ), 0 ) AS saleNum,
+            COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END ), 0 ) AS refundNum,
+            COALESCE ( COUNT( ssd.store_cus_id ), 0 ) AS customerNum,
+            COALESCE ( SUM( sps.quantity ), 0 ) AS storageNum
         FROM
-            store_sale ss
-                JOIN store_sale_detail ssd ON ss.id = ssd.store_sale_id
-                LEFT JOIN store_product_storage sps ON ss.store_id = sps.store_id
+            store_sale_detail ssd
+                LEFT JOIN store_product_storage sps ON ssd.store_id = sps.store_id
         WHERE
-            ss.del_flag = 0 AND ss.voucher_date = #{voucherDate}
+            ssd.del_flag = 0 AND ssd.voucher_date = #{voucherDate}
         GROUP BY
-            ss.store_id
+            ssd.store_id
+
     </select>
 
     <select id="selectSaleThousand" resultType="com.ruoyi.xkt.dto.dailyStoreTag.DailyStoreTagDTO">