From b48d2c1cb711a91b53df6dd8eb34310705190ccb Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 24 Nov 2025 15:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96Key=20=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/mapper/ShopOrderStatisticMapper.java    | 7 +++----
 .../order/service/impl/ShopOrderStatisticServiceImpl.java | 3 +++
 .../src/main/resources/mapper/ShopProdStatisticMapper.xml | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
index 501a392b9..8b684a033 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
@@ -65,8 +65,7 @@ public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic>
             "    tb_shop_order_statistic " +
             "WHERE " +
             "    shop_id = #{shopId} " +
-            "    AND statistic_date > #{start} " +
-            "    AND statistic_date <= #{end} ")
+            "    AND statistic_date BETWEEN #{start} AND #{end} ")
     ShopOrderStatistic countStatistic(Long shopId, LocalDate start, LocalDate end);
     //---------------------------------------------金额统计---------------------------------------------------
     /**
@@ -98,7 +97,7 @@ public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic>
             " tb_shop_order_statistic " +
             " WHERE" +
             " shop_id = #{shopId} " +
-            "and statistic_date > #{start} " +
+            "and statistic_date >= #{start} " +
             "and statistic_date <= #{end} " +
             "GROUP BY tradeDay")
     List<TotalVo> getStatDateRange(Long shopId, LocalDate start, LocalDate end);
@@ -135,7 +134,7 @@ public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic>
             " SUM(credit_pay_count) as creditPay " +
             " FROM tb_shop_order_statistic " +
             " WHERE shop_id = #{shopId} " +
-            " AND statistic_date > #{start} " +
+            " AND statistic_date >= #{start} " +
             " AND statistic_date <= #{end} ")
     Map<String, BigDecimal> getPayTypeDateRangeRaw(Long shopId, LocalDate start, LocalDate end);
 
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
index 9f848067d..0ce33dd95 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
@@ -67,6 +67,9 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
             startDate = currentDate.minusDays(29);
         }
         TotalVo onlineDataAmount = mapper.getOnlineDataAmount(shopId, currentDate);
+        if (onlineDataAmount == null) {
+            onlineDataAmount = new TotalVo(currentDate);
+        }
         List<TotalVo> statDateRange = mapper.getStatDateRange(shopId, startDate, currentDate);
 
         return TotalVo.mergeAndFillData(onlineDataAmount, statDateRange, startDate, currentDate);
diff --git a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
index 64dfdb045..6cc2a68f7 100644
--- a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
@@ -58,7 +58,7 @@
         LEFT JOIN tb_product prod ON tb_shop_prod_statistic.prod_id = prod.id
         WHERE
         tb_shop_prod_statistic.shop_id = #{shopId}
-        AND tb_shop_prod_statistic.create_day &gt; #{start}
+        AND tb_shop_prod_statistic.create_day &gt;= #{start}
         AND tb_shop_prod_statistic.create_day &lt;= #{end}
         <if test="productName != null and productName != ''">
             AND prod.name LIKE CONCAT('%',#{productName},'%')
@@ -73,7 +73,7 @@
     <select id="summaryCountByDay" resultType="com.czg.order.vo.SaleSummaryCountVo">
         SELECT
         sum(detail.num-detail.return_num) as saleCount,
-        sum(detail.pay_amount) as saleAmount,
+        sum(detail.pay_amount) as totalAmount,
         sum(detail.refund_num) refundCount,
         sum(detail.return_amount) refundAmount
         FROM
@@ -107,14 +107,14 @@
      <select id="summaryCountDateRange" resultType="com.czg.order.vo.SaleSummaryCountVo">
          SELECT
          sum(tb_shop_prod_statistic.sale_count) AS saleCount,
-         sum(tb_shop_prod_statistic.sale_amount) AS saleAmount,
+         sum(tb_shop_prod_statistic.sale_amount) AS totalAmount,
          sum(tb_shop_prod_statistic.refund_count) AS refundCount,
          sum(tb_shop_prod_statistic.refund_amount) AS refundAmount
          FROM
          tb_shop_prod_statistic
          WHERE
          tb_shop_prod_statistic.shop_id = #{shopId}
-         AND tb_shop_prod_statistic.create_day &gt; #{start}
+         AND tb_shop_prod_statistic.create_day &gt;= #{start}
          AND tb_shop_prod_statistic.create_day &lt;= #{end}
          <if test="productName != null and productName != ''">
              AND prod.name LIKE CONCAT('%',#{productName},'%')