数据统计 销售趋势

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);