From a76cc4693fafd96fd15a84e164b432c9aca63f37 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 13 Oct 2022 12:03:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=89=E6=97=B6=E4=BC=9A=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/SeckillApplyServiceImpl.java  | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
index 1b7b8f55..c34b7bba 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
@@ -74,20 +74,30 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
 
     @Override
     public List<SeckillTimelineVO> getSeckillTimeline() {
-        //秒杀活动缓存key
-        return getSeckillTimelineInfo();
+        try {
+            //秒杀活动缓存key
+            return getSeckillTimelineInfo();
+        } catch (Exception e) {
+            log.error("获取秒杀时间轴失败", e);
+            return new ArrayList<>();
+        }
     }
 
     @Override
     public List<SeckillGoodsVO> getSeckillGoods(Integer timeline) {
-        List<SeckillGoodsVO> seckillGoodsVoS = new ArrayList<>();
-        //获取
-        List<SeckillTimelineVO> seckillTimelineToCache = getSeckillTimelineInfo();
-        Optional<SeckillTimelineVO> first = seckillTimelineToCache.stream().filter(i -> i.getTimeLine().equals(timeline)).findFirst();
-        if (first.isPresent()) {
-            seckillGoodsVoS = first.get().getSeckillGoodsList();
+        try {
+            List<SeckillGoodsVO> seckillGoodsVoS = new ArrayList<>();
+            //获取
+            List<SeckillTimelineVO> seckillTimelineToCache = getSeckillTimelineInfo();
+            Optional<SeckillTimelineVO> first = seckillTimelineToCache.stream().filter(i -> i.getTimeLine().equals(timeline)).findFirst();
+            if (first.isPresent()) {
+                seckillGoodsVoS = first.get().getSeckillGoodsList();
+            }
+            return seckillGoodsVoS;
+        } catch (Exception e) {
+            log.error("获取秒杀商品失败", e);
+            return new ArrayList<>();
         }
-        return seckillGoodsVoS;
     }
 
     @Override