12/29

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

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

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -588,7 +588,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
     public ResultBean<Object> isSaturAndSun(String cardSid) {
         ResultBean rb = new ResultBean().fail();
         AppletVo vo = getGifCardBySid(cardSid).getData();
-        LocalDate now = DateUtil.parse(vo.getStart()).toSqlDate().toLocalDate();
+        SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        LocalDate now = DateUtil.parse(vo.getStart()).toSqlDate().toLocalDate();
+        LocalDate now = DateUtil.parse(sdf1.format(new Date())).toSqlDate().toLocalDate();
         LocalDate endD = DateUtil.parse(vo.getEnd()).toSqlDate().toLocalDate();
         List<String> weekMap = new ArrayList<>();
         // 第一个星期六