From 5a7486e9893a706ed464e3197c9711286b077896 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 26 六月 2025 11:12:28 +0800
Subject: [PATCH] 文件导入
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 5089e17..1330e2b 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
@@ -56,12 +56,12 @@
/**
- * 通过用户id和商品id查询评价id
+ * 通过订单id查询评价id
*/
- @GetMapping("/getEvaluateIdByUserIdAndGoodId")
- public R<Long> getEvaluateIdByUserIdAndGoodId(@RequestParam("goodId") Integer goodId, @RequestParam("userId") Long userId) {
+ @GetMapping("/getEvaluateIdByOrderId")
+ public R<Long> getEvaluateIdByOrderId( @RequestParam("orderId") Long orderId) {
GoodsEvaluate evaluate = goodsEvaluateMapper.selectOne(new LambdaQueryWrapper<GoodsEvaluate>()
- .eq(GoodsEvaluate::getGoodsId, goodId).eq(GoodsEvaluate::getAppUserId, userId));
+ .eq(GoodsEvaluate::getOrderId, orderId).eq(GoodsEvaluate::getDelFlag,0).eq(GoodsEvaluate::getStatus,2));
if (evaluate != null) {
return R.ok(evaluate.getId());
}
@@ -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);
}
/**
@@ -104,9 +104,11 @@
@ApiOperation(value = "评价详情", tags = {"小程序-查看自己的评价"})
public R<GoodsEvaluate> detail(@PathVariable("orderId") Long orderId){
GoodsEvaluate evaluate = goodsEvaluateService.getOne(new LambdaQueryWrapper<GoodsEvaluate>()
- .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 +121,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 +197,7 @@
Goods goods = goodsService.getById(item.getGoodsId());
if(null != goods){
item.setGoodsName(goods.getName());
+ item.setGoodsImg(goods.getHomePagePicture());
}
}
@@ -205,6 +208,9 @@
@ApiOperation(value = "评论详情", tags = {"管理后台-商品管理-评价管理","门店后台-订单-查看用户评价详情"})
public R<GoodsEvaluate> getDetail(@PathVariable("id") Long id){
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
+ if (null==goodsEvaluate){
+ return R.fail("未找到该评论");
+ }
buildDetail(goodsEvaluate);
return R.ok(goodsEvaluate);
}
--
Gitblit v1.7.1