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