From 443878cad8c61365a7e5a42d502e232cff9d54c5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 20:38:17 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
index b431e08..93872c1 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
@@ -90,6 +90,7 @@
         List<GoodsEvaluate> list = goodsEvaluateService.list(new LambdaQueryWrapper<GoodsEvaluate>()
                 .eq(GoodsEvaluate::getStatus, 2)
                 .eq(GoodsEvaluate::getAppUserId,loginUserApplet.getUserid())
+                .eq(GoodsEvaluate::getDelFlag, 0)
                 .eq(GoodsEvaluate::getOrderId, orderId));
         for (GoodsEvaluate goodsEvaluate : list) {
             Goods goods = goodsService.getById(goodsEvaluate.getGoodsId());
@@ -111,7 +112,7 @@
         goodsEvaluateService.updateById(goodsEvaluate);
         //修改订单为待评价
         Order data = orderClient.getOrderById(goodsEvaluate.getOrderId()).getData();
-        data.setOrderStatus(4);
+        data.setOrderStatus(data.getOldOrderStatus());
         orderClient.editOrder(data);
         return R.ok();
     }
@@ -156,6 +157,7 @@
                 .in(!goodsIds.isEmpty(), GoodsEvaluate::getGoodsId, goodsIds)
                 .in(!usersNameList.isEmpty(), GoodsEvaluate::getAppUserId, usersNameList)
                 .eq(goodsEvaluate.getStatus() != null, GoodsEvaluate::getStatus, goodsEvaluate.getStatus())
+                .eq(GoodsEvaluate::getDelFlag, 0)
                 .orderByDesc(GoodsEvaluate::getCreateTime));
 
 

--
Gitblit v1.7.1