From 9eac84919df3312321ad506dd736d4e30c499059 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 18 Dec 2023 10:26:39 +0800
Subject: [PATCH] 12/18

---
 .../biz/lpkgiftcard/LpkGiftCardService.java   | 37 ++-----------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
index 25da08a..839773b 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -640,45 +640,14 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             sunday = sunday.plus(Period.ofDays(7));
             System.out.println(sunday.compareTo(endD));
         } while (sunday.compareTo(endD) < 1);
-        weekMap.add("2024-01-01");
+        String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
+        int y=DateUtil.year(DateUtil.parse(nextYear));
+        weekMap.add(String.valueOf(y)+"-01-01");
         Object[] array = weekMap.stream().sorted().toArray();
         return rb.success().setData(array);
     }
 
     public static void main(String[] args) {
-        String startDate = "2023-12-16";
-        String endDate = "2024-12-14";
-        LocalDate now = DateUtil.parse(startDate).toSqlDate().toLocalDate();
-        LocalDate endD = DateUtil.parse(endDate).toSqlDate().toLocalDate();
-        List<String> weekMap = new ArrayList<>();
-        // 第一个星期六
-//        LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY));
-        LocalDate saturday = now.with(DayOfWeek.SATURDAY);
-        do {
-            if (CollectionUtils.isEmpty(weekMap)) {
-                weekMap.add(saturday.toString());
-            } else {
-                weekMap.add(saturday.toString());
-            }
-            // 迭代一个星期
-            saturday = saturday.plus(Period.ofDays(7));
-            System.out.println(saturday.compareTo(endD));
-        } while (saturday.compareTo(endD) < 1);
-        // 第一个星期天
-        LocalDate sunday = now.with(DayOfWeek.SUNDAY);
-        do {
-            if (CollectionUtils.isEmpty(weekMap)) {
-                weekMap.add(saturday.toString());
-            } else {
-                weekMap.add(sunday.toString());
-            }
-            // 迭代一个星期
-            sunday = sunday.plus(Period.ofDays(7));
-            System.out.println(sunday.compareTo(endD));
-        } while (sunday.compareTo(endD) < 1);
-        Object[] array = weekMap.stream().sorted().toArray();
-
-        System.out.println(array);
     }
 
     @Transactional(rollbackFor = Exception.class)