From a88a536514b0ee5fb863dd5c992279d5b86ad77f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 18:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java | 10 ++++++++--
1 files changed, 8 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 943bb2c..84c6f9a 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,6 +3,7 @@
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.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.order.model.Order;
import com.ruoyi.other.mapper.GoodsEvaluateMapper;
@@ -29,13 +30,18 @@
private RemoteOrderGoodsClient remoteOrderGoodsClient;
@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 {
+ save(goodsEvaluate);
+ }
}
- this.saveBatch(evaluates);
if (CollectionUtil.isNotEmpty(evaluates)){
Order order = new Order();
order.setId(goodsEvaluateVO.getEvaluates().get(0).getOrderId());
--
Gitblit v1.7.1