From d1d42e8fdfce6fbfea92d1b77cf4b59be4922644 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sun, 29 Sep 2024 09:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=B6=8B=E5=8A=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/order/TbOrderInfoRepository.java    |  2 +-
 .../cashier/service/impl/SummaryServiceImpl.java   |  6 ++++--
 .../src/main/java/cn/ysk/cashier/vo/SumDateVO.java | 14 +++++++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
index 36fe918a..96ee1687 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
@@ -128,7 +128,7 @@ public interface TbOrderInfoRepository extends JpaRepository<TbOrderInfo, Intege
                                                 @Param("currentPage") Integer currentPage, @Param("currentSize") Integer currentSize);
 
 
-    @Query(value = "SELECT ifnull( sum( order_amount ), 0 ) AS amount,trade_day as tradeDay " +
+    @Query(value = "SELECT ifnull( sum( order_amount ), 0 ) AS amount,trade_day as tradeDay ,ifnull( sum(discount_amount), 0 ) AS saveAmount " +
             "FROM tb_order_info WHERE shop_id = :shopId AND ((status = 'closed') OR ( status ='refund' AND order_type != 'return' ))" +
             "AND trade_day BETWEEN :startTime AND :endTime " +
             "GROUP BY shop_id,trade_day", nativeQuery = true)
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
index f9faa898..74cc6a30 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
@@ -243,6 +243,7 @@ public class SummaryServiceImpl implements SummaryService {
             SumDateVO sumDateVO = new SumDateVO();
             sumDateVO.setAmount((BigDecimal) o[0]);
             sumDateVO.setTradeDay((String) o[1]);
+            sumDateVO.setSaveAmount((BigDecimal) o[2]);
             sumDateVOList.add(sumDateVO);
         }
         //填充日期
@@ -250,7 +251,8 @@ public class SummaryServiceImpl implements SummaryService {
         for (SumDateVO entry : sumDateVOList) {
             String tradeDay = entry.getTradeDay();
             BigDecimal amount = entry.getAmount();
-            dataMap.put(tradeDay, new SumDateVO(tradeDay, amount));
+            BigDecimal saveAmount = entry.getSaveAmount();
+            dataMap.put(tradeDay, new SumDateVO(tradeDay, amount, saveAmount));
         }
         // 获取今天的日期
         LocalDate today = LocalDate.now();
@@ -267,7 +269,7 @@ public class SummaryServiceImpl implements SummaryService {
                 sumDateVO = dataMap.get(tradeDayString);
             } else {
                 // 如果不存在，则创建新的SumDateVO对象，amount设为0
-                sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO);
+                sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO, BigDecimal.ZERO);
             }
             // 将SumDateVO对象添加到列表中
             sumDateList.add(sumDateVO);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java
index 9dcf8407..4e72910a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java
@@ -13,6 +13,7 @@ import java.time.LocalDate;
 public class SumDateVO {
     private String tradeDay;
     private BigDecimal amount;
+    private BigDecimal saveAmount;
 
     public SumDateVO() {
 
@@ -34,8 +35,19 @@ public class SumDateVO {
         this.amount = amount;
     }
 
-    public SumDateVO(String tradeDay, BigDecimal amount) {
+
+    public BigDecimal getSaveAmount() {
+        return saveAmount;
+    }
+
+    public void setSaveAmount(BigDecimal saveAmount) {
+        this.saveAmount = saveAmount;
+    }
+
+
+    public SumDateVO(String tradeDay, BigDecimal amount, BigDecimal saveAmount) {
         this.tradeDay = tradeDay;
         this.amount = amount;
+        this.saveAmount = saveAmount;
     }
 }