From 936397c59f884e3975540f72281641bd7c19db0d Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 24 Jan 2022 18:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A5=BD=E8=AF=84=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=80=E4=B8=AA=E5=85=A8=E7=BA=BF=E5=88=A4=E5=AE=9A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/member/MemberEvaluationBuyerController.java  | 2 +-
 .../handler/impl/order/OrderEveryDayTaskExecute.java        | 2 +-
 .../modules/member/service/MemberEvaluationService.java     | 3 ++-
 .../member/serviceimpl/MemberEvaluationServiceImpl.java     | 6 ++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
index acf5b34d..16b5be8a 100644
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
@@ -40,7 +40,7 @@ public class MemberEvaluationBuyerController {
     @ApiOperation(value = "添加会员评价")
     @PostMapping
     public ResultMessage<MemberEvaluationDTO> save(@Valid MemberEvaluationDTO memberEvaluationDTO) {
-        return ResultUtil.data(memberEvaluationService.addMemberEvaluation(memberEvaluationDTO));
+        return ResultUtil.data(memberEvaluationService.addMemberEvaluation(memberEvaluationDTO, true));
     }
 
     @ApiOperation(value = "查看会员评价详情")
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 bfe509b3..f0b8a077 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
@@ -146,7 +146,7 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
                 memberEvaluationDTO.setDescriptionScore(5);
                 memberEvaluationDTO.setServiceScore(5);
 
-                memberEvaluationService.addMemberEvaluation(memberEvaluationDTO);
+                memberEvaluationService.addMemberEvaluation(memberEvaluationDTO, false);
             }
         }
     }
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java
index 1b600ce9..860018be 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java
@@ -41,9 +41,10 @@ public interface MemberEvaluationService extends IService<MemberEvaluation> {
      * 4.发送用户评价消息修改商品的评价数量以及好评率
      *
      * @param memberEvaluationDTO 评论
+     * @param isSelf              是否自己操作（true：买家操作/false 系统操作）
      * @return 操作状态
      */
-    MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO);
+    MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO, Boolean isSelf);
 
     /**
      * 根据ID查询会员评价
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 4b6e1d91..bce3490f 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
@@ -106,13 +106,15 @@ public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMap
     }
 
     @Override
-    public MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO) {
+    public MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO, Boolean isSelf) {
         //获取子订单信息
         OrderItem orderItem = orderItemService.getBySn(memberEvaluationDTO.getOrderItemSn());
         //获取订单信息
         Order order = orderService.getBySn(orderItem.getOrderSn());
         //检测是否可以添加会员评价
-        checkMemberEvaluation(orderItem, order);
+        if (isSelf) {
+            checkMemberEvaluation(orderItem, order);
+        }
         //获取用户信息
         Member member = memberService.getUserInfo();
         //获取商品信息