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 13:21:08 +08:00
parent 399433b8e0
commit a286164261
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
View File

@@ -134,7 +134,7 @@ public class AppletVo {
} }
else if(isTransfer.equals("1")){ else if(isTransfer.equals("1")){
state="已转赠"; state="已转赠";
// showBtn=false; showBtn=false;
this.notRese=false; this.notRese=false;
} }
else{ else{

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

@@ -219,7 +219,6 @@ 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);
} }
@@ -588,13 +587,16 @@ 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 appletVo = baseMapper.getGifCardBySid(cardSid);
Date date =new Date();
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowDate =sdf1.format(date);
// AppletVo vo = getGifCardBySid(cardSid).getData();
// LocalDate now = DateUtil.parse(sdf1.format(DateUtil.parse(appletVo.getStart()))).toSqlDate().toLocalDate();
LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate();
LocalDate endD = DateUtil.parse(appletVo.getDateEnd()).toSqlDate().toLocalDate();
// 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<>(); List<String> weekMap = new ArrayList<>();
// 第一个星期六 // 第一个星期六
// LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY)); // LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY));
@@ -607,7 +609,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
} }
// 迭代一个星期 // 迭代一个星期
saturday = saturday.plus(Period.ofDays(7)); saturday = saturday.plus(Period.ofDays(7));
System.out.println(saturday.compareTo(endD));
} while (saturday.compareTo(endD) < 1); } while (saturday.compareTo(endD) < 1);
// 第一个星期天 // 第一个星期天
LocalDate sunday = now.with(DayOfWeek.SUNDAY); LocalDate sunday = now.with(DayOfWeek.SUNDAY);
@@ -619,7 +620,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
} }
// 迭代一个星期 // 迭代一个星期
sunday = sunday.plus(Period.ofDays(7)); sunday = sunday.plus(Period.ofDays(7));
System.out.println(sunday.compareTo(endD));
} while (sunday.compareTo(endD) < 1); } while (sunday.compareTo(endD) < 1);
String nextYear = DateUtil.offsetMonth(new Date(), 12).toString(); String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
int y = DateUtil.year(DateUtil.parse(nextYear)); int y = DateUtil.year(DateUtil.parse(nextYear));