From c48dcda73f4932a2ec4c0727618ce6edaf4fcfea Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 29 Dec 2023 10:28:06 +0800
Subject: [PATCH] 12/29

---
 .../java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java | 3 ++-
 .../java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
index 7e95c1b..a896725 100644
--- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
+++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
@@ -785,7 +785,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
         ResultBean rb = new ResultBean().fail();
         EmpCardGift empCardGift=baseMapper.selectOne(new QueryWrapper<EmpCardGift>().eq("sid",cardSid));
         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();
         List<String> weekMap = new ArrayList<>();
         // 第一个星期六
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
index 4ec9cf3..668e285 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -588,7 +588,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
     public ResultBean<Object> isSaturAndSun(String cardSid) {
         ResultBean rb = new ResultBean().fail();
         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();
         List<String> weekMap = new ArrayList<>();
         // 第一个星期六