product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

12/29

Browse Source
This commit is contained in:
wangpengfei
2023-12-29 11:20:56 +08:00
parent c48dcda73f
commit 399433b8e0
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
View File

@@ -219,6 +219,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
vo.setEmpCardGift(empCardGift); vo.setEmpCardGift(empCardGift);
vo.setOrderCardVoList(lpkReserveOrderCardVos); vo.setOrderCardVoList(lpkReserveOrderCardVos);
vo.setGoodsVos(goodsVos); vo.setGoodsVos(goodsVos);
System.out.println("----------------------------------"+vo);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@@ -589,9 +590,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
ResultBean rb = new ResultBean().fail(); ResultBean rb = new ResultBean().fail();
AppletVo vo = getGifCardBySid(cardSid).getData(); AppletVo vo = getGifCardBySid(cardSid).getData();
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// LocalDate now = DateUtil.parse(vo.getStart()).toSqlDate().toLocalDate(); // LocalDate now = DateUtil.parse(vo.getStart()).toSqlDate().toLocalDate();
LocalDate now = DateUtil.parse(sdf1.format(new Date())).toSqlDate().toLocalDate(); LocalDate now = DateUtil.parse(sdf1.format(new Date())).toSqlDate().toLocalDate();
LocalDate endD = DateUtil.parse(vo.getEnd()).toSqlDate().toLocalDate(); LocalDate endD = DateUtil.parse(vo.getEnd()).toSqlDate().toLocalDate();
System.out.println("-------------------------------------------------------"+vo.getEnd());
List<String> weekMap = new ArrayList<>(); List<String> weekMap = new ArrayList<>();
// 第一个星期六 // 第一个星期六
// LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY)); // LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY));