From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 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 943bb2c..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
@@ -3,16 +3,21 @@
 import cn.hutool.core.collection.CollectionUtil;
 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;
 
 /**
@@ -27,18 +32,33 @@
 public class GoodsEvaluateServiceImpl extends ServiceImpl<GoodsEvaluateMapper, GoodsEvaluate> implements GoodsEvaluateService {
     @Resource
     private RemoteOrderGoodsClient remoteOrderGoodsClient;
+    @Resource
+    private TokenService tokenService;
+    @Resource
+    private OrderClient orderClient;
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void addGoodsEvaluate(GoodsEvaluateVO goodsEvaluateVO) {
         List<GoodsEvaluate> evaluates = goodsEvaluateVO.getEvaluates();
         for (GoodsEvaluate goodsEvaluate : evaluates) {
             goodsEvaluate.setStatus(2);
+            if (StringUtils.isNotEmpty(goodsEvaluate.getIdStr())){
+                goodsEvaluate.setId(Long.valueOf(goodsEvaluate.getIdStr()));
+                updateById(goodsEvaluate);
+            }else {
+                LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+                goodsEvaluate.setAppUserId(loginUserApplet.getUserid());
+                goodsEvaluate.setCreateTime(LocalDateTime.now());
+                save(goodsEvaluate);
+            }
         }
-        this.saveBatch(evaluates);
         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