From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
index a15a122..c9c10f8 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
@@ -92,9 +92,9 @@
*/
@PostMapping("/addGoodsEvaluate")
@ApiOperation(value = "发布商品评价", tags = {"小程序-个人中心-我的订单"})
- public R<Void> addGoodsEvaluate(@RequestBody GoodsEvaluate goodsEvaluate){
- goodsEvaluateService.addGoodsEvaluate(goodsEvaluate);
- return R.ok();
+ public R addGoodsEvaluate(@RequestBody GoodsEvaluate goodsEvaluate){
+
+ return goodsEvaluateService.addGoodsEvaluate(goodsEvaluate);
}
/**
@@ -107,6 +107,9 @@
.eq(GoodsEvaluate::getStatus, 2)
.eq(GoodsEvaluate::getDelFlag, 0)
.eq(GoodsEvaluate::getOrderId, orderId));
+ if(evaluate==null){
+ return R.fail("未评价");
+ }
Goods goods = goodsService.getById(evaluate.getGoodsId());
evaluate.setGoodsName(goods.getName());
evaluate.setGoodsImg(goods.getHomePagePicture());
@@ -119,14 +122,14 @@
* 删除评价
*/
@DeleteMapping("/delete/{id}")
- @ApiOperation(value = "删除评论", tags = {"管理后台-商品管理-评价管理"})
+ @ApiOperation(value = "删除评论", tags = {"后台-商品管理-评价管理"})
public R<Void> delete(@PathVariable("id") Long id){
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
goodsEvaluate.setDelFlag(1);
goodsEvaluateService.updateById(goodsEvaluate);
//修改订单为待评价
Order data = orderClient.getOrderById(goodsEvaluate.getOrderId()).getData();
- data.setOrderStatus(data.getOldOrderStatus());
+ data.setOrderStatus(4);//已完成状态
orderClient.editOrder(data);
return R.ok();
}
@@ -195,6 +198,7 @@
Goods goods = goodsService.getById(item.getGoodsId());
if(null != goods){
item.setGoodsName(goods.getName());
+ item.setGoodsImg(goods.getHomePagePicture());
}
}
--
Gitblit v1.7.1