|
|
@ -219,6 +219,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp |
|
|
|
vo.setEmpCardGift(empCardGift); |
|
|
|
vo.setOrderCardVoList(lpkReserveOrderCardVos); |
|
|
|
vo.setGoodsVos(goodsVos); |
|
|
|
System.out.println("----------------------------------"+vo); |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
@ -589,9 +590,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp |
|
|
|
ResultBean rb = new ResultBean().fail(); |
|
|
|
AppletVo vo = getGifCardBySid(cardSid).getData(); |
|
|
|
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(); |
|
|
|
System.out.println("-------------------------------------------------------"+vo.getEnd()); |
|
|
|
List<String> weekMap = new ArrayList<>(); |
|
|
|
// 第一个星期六
|
|
|
|
// LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY));
|
|
|
|