From 554aed024cd2add5c76577e3264c8dd0e65ede36 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Thu, 12 Dec 2024 16:08:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=97=B6=E5=95=86=E5=93=81=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=80=A7=E6=A3=80=E6=9F=A5=E4=BB=A5=E4=BF=AE=E5=A4=8D=E6=BD=9C?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=20(pg)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在会员评价时获取商品信息后增加商品存在性检查，避免空指针异常。当商品不存在时，记录错误日志并返回null。
---
 .../member/serviceimpl/MemberEvaluationServiceImpl.java    | 7 +++++++
 1 file changed, 7 insertions(+)

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 cc10d2f6..a01be294 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
@@ -121,6 +121,13 @@ public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMap
         }
         //获取商品信息
         GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(memberEvaluationDTO.getSkuId());
+
+        // 商品是否存在
+        if (goodsSku == null) {
+            log.error("商品不存在，商品ID：" + memberEvaluationDTO.getSkuId());
+            return null;
+        }
+
         //新增用户评价
         MemberEvaluation memberEvaluation = new MemberEvaluation(memberEvaluationDTO, goodsSku, member, order);
         //过滤商品咨询敏感词

From 478dd1d201425643ca75a8322ccb0f5656aa7018 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Thu, 12 Dec 2024 16:53:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=92=8C=E5=95=86=E5=93=81=E5=AD=98=E5=9C=A8=E6=80=A7=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BB=A5=E6=94=B9=E5=96=84=E8=AF=84=E4=BB=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20(pg)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在MemberEvaluationServiceImpl中引入订单和商品存在性检查。
- 当订单或商品不存在时，抛出异常以避免错误日志的产生。
- 同时，在OrderEveryDayTaskExecute中捕获异常时更新评价状态。
---
 .../impl/order/OrderEveryDayTaskExecute.java      |  9 +++++----
 .../serviceimpl/MemberEvaluationServiceImpl.java  | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java
index b7edf22a..91842ce7 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java
@@ -29,14 +29,14 @@ import cn.lili.modules.system.service.SettingService;
 import cn.lili.timetask.handler.EveryDayExecute;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import java.util.List;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author paulG
  * @since 2021/3/11
@@ -198,8 +198,9 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
 
                 try {
                     memberEvaluationService.addMemberEvaluation(memberEvaluationDTO, false);
-
                 } catch (Exception e) {
+                    // 修改订单货物评价状态为已评价避免无限调用评价异常
+                    orderItemService.updateCommentStatus(orderItem.getSn(), CommentStatusEnum.FINISHED);
                     log.error(e.getMessage(), 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 a01be294..749c1365 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
@@ -102,8 +102,18 @@ public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMap
     public MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO, Boolean isSelf) {
         //获取子订单信息
         OrderItem orderItem = orderItemService.getBySn(memberEvaluationDTO.getOrderItemSn());
+
+        if (orderItem == null) {
+            throw new ServiceException(ResultCode.ORDER_ITEM_NOT_EXIST);
+        }
+
         //获取订单信息
         Order order = orderService.getBySn(orderItem.getOrderSn());
+
+        if (order == null) {
+            throw new ServiceException(ResultCode.ORDER_NOT_EXIST);
+        }
+
         //检测是否可以添加会员评价
         Member member;
 
@@ -119,13 +129,12 @@ public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMap
                 throw new ServiceException(ResultCode.USER_NOT_EXIST);
             }
         }
+
         //获取商品信息
         GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(memberEvaluationDTO.getSkuId());
 
-        // 商品是否存在
         if (goodsSku == null) {
-            log.error("商品不存在，商品ID：" + memberEvaluationDTO.getSkuId());
-            return null;
+            throw new ServiceException(ResultCode.GOODS_NOT_EXIST);
         }
 
         //新增用户评价