From 451116c1df3c639da15b3d213f3fcff2f585337a Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期二, 15 四月 2025 19:22:52 +0800 Subject: [PATCH] 前端联调 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 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 418b66b..54f4cea 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 @@ -1,6 +1,7 @@ package com.ruoyi.other.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; @@ -41,21 +42,22 @@ @Override @Transactional(rollbackFor = Exception.class) - public void addGoodsEvaluate(GoodsEvaluate goodsEvaluate) { + public R addGoodsEvaluate(GoodsEvaluate goodsEvaluate) { - - 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); + if (goodsEvaluate.getId() == null) { + //新增 + GoodsEvaluate evaluate = this.getOne(new LambdaQueryWrapper<GoodsEvaluate>() + .eq(GoodsEvaluate::getStatus, 2) + .eq(GoodsEvaluate::getDelFlag, 0) + .eq(GoodsEvaluate::getOrderId, goodsEvaluate.getId())); + if (evaluate != null) { + return R.fail("已评价过"); } - - + goodsEvaluate.setStatus(2); + LoginUser loginUserApplet = tokenService.getLoginUserApplet(); + goodsEvaluate.setAppUserId(loginUserApplet.getUserid()); + goodsEvaluate.setCreateTime(LocalDateTime.now()); + save(goodsEvaluate); Long orderId = goodsEvaluate.getOrderId(); Order data = orderClient.getOrderById(orderId).getData(); Order order = new Order(); @@ -63,10 +65,14 @@ order.setOldOrderStatus(data.getOrderStatus()); order.setOrderStatus(8); R<Void> r = remoteOrderGoodsClient.updateOrderStatus(order); - if (R.isError(r)){ + if (R.isError(r)) { throw new RuntimeException("修改订单状态失败"); } - - + } else { + //修改 + goodsEvaluate.setUpdateTime(LocalDateTime.now()); + updateById(goodsEvaluate); + } + return R.ok(); } } -- Gitblit v1.7.1