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 10:28:06 +08:00
parent 62d6ceef66
commit c48dcda73f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
View File

@@ -785,7 +785,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
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));
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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(); LocalDate endD = DateUtil.parse(sdf1.format(empCardGift.getEndDate())).toSqlDate().toLocalDate();
List<String> weekMap = new ArrayList<>(); List<String> weekMap = new ArrayList<>();
// 第一个星期六 // 第一个星期六

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

@@ -588,7 +588,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
public ResultBean<Object> isSaturAndSun(String cardSid) { public ResultBean<Object> isSaturAndSun(String cardSid) {
ResultBean rb = new ResultBean().fail(); ResultBean rb = new ResultBean().fail();
AppletVo vo = getGifCardBySid(cardSid).getData(); 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(); LocalDate endD = DateUtil.parse(vo.getEnd()).toSqlDate().toLocalDate();
List<String> weekMap = new ArrayList<>(); List<String> weekMap = new ArrayList<>();
// 第一个星期六 // 第一个星期六