From a286164261a7e35eeb1bbcde86ad2db8ac9bf397 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 29 Dec 2023 13:21:08 +0800
Subject: [PATCH] 12/29

---
 .../com/yxt/yyth/api/lpkgiftcard/AppletVo.java   |  2 +-
 .../yyth/biz/lpkgiftcard/LpkGiftCardService.java | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
index 45bb9a0..dd212d7 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
@@ -134,7 +134,7 @@ public class AppletVo {
             }
             else if(isTransfer.equals("1")){
                 state="已转赠";
-//                showBtn=false;
+                showBtn=false;
                 this.notRese=false;
             }
             else{
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 5607bb3..df509ee 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -219,7 +219,6 @@ 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);
     }
 
@@ -588,13 +587,16 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
 
     public ResultBean<Object> isSaturAndSun(String cardSid) {
         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");
+        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<>();
         // 第一个星期六
 //        LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY));
@@ -607,7 +609,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             }
             // 迭代一个星期
             saturday = saturday.plus(Period.ofDays(7));
-            System.out.println(saturday.compareTo(endD));
         } while (saturday.compareTo(endD) < 1);
         // 第一个星期天
         LocalDate sunday = now.with(DayOfWeek.SUNDAY);
@@ -619,7 +620,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             }
             // 迭代一个星期
             sunday = sunday.plus(Period.ofDays(7));
-            System.out.println(sunday.compareTo(endD));
         } while (sunday.compareTo(endD) < 1);
         String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
         int y = DateUtil.year(DateUtil.parse(nextYear));