From b32bf41443c73504c384921eccf57d72a7c44939 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 16 Feb 2022 17:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=80=85=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=9A?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=8A=A8=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E9=97=AE=E9=A2=98=EF=BC=8C=E5=92=8C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/promotion/PromotionEverydayExecute.java | 16 ++++++++++++----
 .../serviceimpl/MemberEvaluationServiceImpl.java |  8 ++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
index d7a3db4c..3d9dc61a 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
@@ -44,10 +44,18 @@ public class PromotionEverydayExecute implements EveryDayExecute {
      */
     @Override
     public void execute() {
-        //清除所以商品索引的无效促销活动
-        this.esGoodsIndexService.cleanInvalidPromotion();
-        //定时创建活动
-        addSeckill();
+        try {
+            //清除所有商品索引的无效促销活动
+            this.esGoodsIndexService.cleanInvalidPromotion();
+        } catch (Exception e) {
+            log.error("清楚商品索引中无效促销异常", e);
+        }
+        try {
+            //定时创建活动
+            addSeckill();
+        } catch (Exception e) {
+            log.error("秒杀活动添加异常", e);
+        }
 
     }
 
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java
index 90f7c823..393a2339 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java
@@ -112,11 +112,15 @@ public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMap
         //获取订单信息
         Order order = orderService.getBySn(orderItem.getOrderSn());
         //检测是否可以添加会员评价
+        Member member;
         if (Boolean.TRUE.equals(isSelf)) {
             checkMemberEvaluation(orderItem, order);
+            //获取用户信息 非自己评价时，读取数据库
+            member = memberService.getById(order.getMemberId());
+        } else {
+            //自我评价商品时，获取当前登录用户信息
+            member = memberService.getUserInfo();
         }
-        //获取用户信息
-        Member member = memberService.getUserInfo();
         //获取商品信息
         GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(memberEvaluationDTO.getSkuId());
         //新增用户评价