12/28

src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java

@@ -772,8 +772,9 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
     public ResultBean<Object> isSaturAndSun(String cardSid) {
         ResultBean rb = new ResultBean().fail();
         EmpCardGift empCardGift=baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid",cardSid));
-        LocalDate now = DateUtil.parse(empCardGift.getStartDate().toString()).toSqlDate().toLocalDate();
-        LocalDate endD = DateUtil.parse(empCardGift.getEndDate().toString()).toSqlDate().toLocalDate();
+        SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        LocalDate now = DateUtil.parse(sdf1.format(empCardGift.getStartDate())).toSqlDate().toLocalDate();
+        LocalDate endD = DateUtil.parse(sdf1.format(empCardGift.getEndDate())).toSqlDate().toLocalDate();
         List<String> weekMap = new ArrayList<>();
         // 第一个星期六
         //        LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY));