Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

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() {
-        //清除所以商品索引的无效促销活动
+        try {
+            //清除所有商品索引的无效促销活动
             this.esGoodsIndexService.cleanInvalidPromotion();
+        } catch (Exception e) {
+            log.error("清楚商品索引中无效促销异常", e);
+        }
+        try {
             //定时创建活动
             addSeckill();
+        } catch (Exception e) {
+            log.error("秒杀活动添加异常", e);
+        }
 
     }
 

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());
         //新增用户评价