From 3eac3116ce54c2593f09a74feed370cf0800028e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 21:21:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java
index e3d9684..38d3748 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.order.model.Order;
import com.ruoyi.other.mapper.GoodsEvaluateMapper;
@@ -33,6 +34,8 @@
private RemoteOrderGoodsClient remoteOrderGoodsClient;
@Resource
private TokenService tokenService;
+ @Resource
+ private OrderClient orderClient;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -51,8 +54,11 @@
}
}
if (CollectionUtil.isNotEmpty(evaluates)){
+ Long orderId = goodsEvaluateVO.getEvaluates().get(0).getOrderId();
+ Order data = orderClient.getOrderById(orderId).getData();
Order order = new Order();
- order.setId(goodsEvaluateVO.getEvaluates().get(0).getOrderId());
+ order.setId(data.getId());
+ order.setOldOrderStatus(data.getOrderStatus());
order.setOrderStatus(8);
R<Void> r = remoteOrderGoodsClient.updateOrderStatus(order);
if (R.isError(r)){
--
Gitblit v1.7.1