From 4db8023227b3900740b8be361c436ddadb1d0585 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 08:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java | 10 +++++++++-
1 files changed, 9 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 1d047e0..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;
@@ -16,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -32,6 +34,8 @@
private RemoteOrderGoodsClient remoteOrderGoodsClient;
@Resource
private TokenService tokenService;
+ @Resource
+ private OrderClient orderClient;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -45,12 +49,16 @@
}else {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
goodsEvaluate.setAppUserId(loginUserApplet.getUserid());
+ goodsEvaluate.setCreateTime(LocalDateTime.now());
save(goodsEvaluate);
}
}
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