From d0b043b8fa5f19d1295cac50fece0c65fceb3920 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 17:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 1a2de9a..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
@@ -4,16 +4,20 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
import com.ruoyi.other.api.domain.GoodsEvaluate;
import com.ruoyi.other.service.GoodsEvaluateService;
import com.ruoyi.other.vo.GoodsEvaluateVO;
+import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -28,6 +32,10 @@
public class GoodsEvaluateServiceImpl extends ServiceImpl<GoodsEvaluateMapper, GoodsEvaluate> implements GoodsEvaluateService {
@Resource
private RemoteOrderGoodsClient remoteOrderGoodsClient;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private OrderClient orderClient;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -37,14 +45,20 @@
goodsEvaluate.setStatus(2);
if (StringUtils.isNotEmpty(goodsEvaluate.getIdStr())){
goodsEvaluate.setId(Long.valueOf(goodsEvaluate.getIdStr()));
- saveOrUpdate(goodsEvaluate);
+ updateById(goodsEvaluate);
}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