This commit is contained in:
2023-12-28 09:07:51 +08:00
parent 2b2121c7e4
commit c43b68424a

View File

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