From 19ec96e0dcc76ea696c6e227364e3d7d143666ea Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Fri, 6 Jun 2025 10:54:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88=20-=20?=
 =?UTF-8?q?=E9=A3=9F=E5=A0=82=EF=BC=88=E8=B6=85=E5=B8=82=EF=BC=89=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=8A=E9=94=80=E9=87=8F=E8=B6=8B=E5=8A=BF=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5weekDay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/DataScreeningServiceImpl.java     | 25 +++++++++++++++++++
 .../canteen/core/screening/vo/EchartsVO.java  |  1 +
 2 files changed, 26 insertions(+)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java
index 0fe59e9..b77ae6d 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java
@@ -183,6 +183,9 @@ public class DataScreeningServiceImpl implements DataScreeningService {
         List<EchartsVO> result = dateList.stream().map(dateStr -> {
             EchartsVO echartsVO = dataMap.getOrDefault(dateStr, new EchartsVO());
             echartsVO.setOrderDate(dateStr);
+            //根据日期设置星期几
+
+            echartsVO.setWeekday(getWeekday(dateStr));
             echartsVO.setSalesValue(Optional.ofNullable(echartsVO.getSalesValue())
                     .map(value -> new BigDecimal(value).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP).toString())
                     .orElse("0"));
@@ -279,4 +282,26 @@ public class DataScreeningServiceImpl implements DataScreeningService {
         }
         return dates;
     }
+
+    /**
+     * 根据日期字符串获取星期几
+     *
+     * @param dateStr 日期字符串，格式为yyyy-MM-dd
+     * @return 星期几
+     */
+    private String getWeekday(String dateStr) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = sdf.parse(dateStr);
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(date);
+            String[] weekDays = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
+            int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK) - 1;
+            if (dayOfWeek < 0) dayOfWeek = 0;
+            return weekDays[dayOfWeek];
+        } catch (Exception e) {
+            log.error("日期转换异常", e);
+            return "";
+        }
+    }
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/EchartsVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/EchartsVO.java
index 56a19a4..8d6e478 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/EchartsVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/EchartsVO.java
@@ -11,4 +11,5 @@ public class EchartsVO {
     private String salesValue;
     private String orderValue;
     private String orderDate;
+    private String weekday;
 }