From 04ce420613f90f8414e87e8fe68484fc32485349 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 24 六月 2025 18:49:06 +0800
Subject: [PATCH] 部署
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 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 13e38b3..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
@@ -14,6 +14,7 @@
import com.ruoyi.order.model.Order;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsEvaluate;
+import com.ruoyi.other.mapper.GoodsEvaluateMapper;
import com.ruoyi.other.service.GoodsEvaluateService;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.vo.GoodsEvaluateVO;
@@ -43,6 +44,8 @@
@Resource
private GoodsEvaluateService goodsEvaluateService;
@Resource
+ private GoodsEvaluateMapper goodsEvaluateMapper;
+ @Resource
private AppUserClient appUserClient;
@Resource
private GoodsService goodsService;
@@ -52,7 +55,19 @@
private OrderClient orderClient;
+ /**
+ * 通过订单id查询评价id
+ */
+ @GetMapping("/getEvaluateIdByOrderId")
+ public R<Long> getEvaluateIdByOrderId( @RequestParam("orderId") Long orderId) {
+ GoodsEvaluate evaluate = goodsEvaluateMapper.selectOne(new LambdaQueryWrapper<GoodsEvaluate>()
+ .eq(GoodsEvaluate::getOrderId, orderId).eq(GoodsEvaluate::getDelFlag,0).eq(GoodsEvaluate::getStatus,2));
+ if (evaluate != null) {
+ return R.ok(evaluate.getId());
+ }
+ return R.ok(null);
+ }
@GetMapping("/goodsList")
@ApiOperation(value = "获取商品评价", tags = {"小程序-获取商品评价"})
@@ -77,44 +92,43 @@
*/
@PostMapping("/addGoodsEvaluate")
@ApiOperation(value = "发布商品评价", tags = {"小程序-个人中心-我的订单"})
- public R<Void> addGoodsEvaluate(@RequestBody GoodsEvaluateVO goodsEvaluateVO){
- goodsEvaluateService.addGoodsEvaluate(goodsEvaluateVO);
- return R.ok();
+ public R addGoodsEvaluate(@RequestBody GoodsEvaluate goodsEvaluate){
+
+ return goodsEvaluateService.addGoodsEvaluate(goodsEvaluate);
}
/**
- * 评论详情
+ * 商品评价详情
*/
@GetMapping("/detail/{orderId}")
- @ApiOperation(value = "评论详情", tags = {"小程序-评论详情"})
- public R<List<GoodsEvaluate>> detail(@PathVariable("orderId") Long orderId){
- LoginUser loginUserApplet = tokenService.getLoginUserApplet();
- List<GoodsEvaluate> list = goodsEvaluateService.list(new LambdaQueryWrapper<GoodsEvaluate>()
- .eq(GoodsEvaluate::getStatus, 2)
- .eq(GoodsEvaluate::getAppUserId,loginUserApplet.getUserid())
+ @ApiOperation(value = "评价详情", tags = {"小程序-查看自己的评价"})
+ public R<GoodsEvaluate> detail(@PathVariable("orderId") Long orderId){
+ GoodsEvaluate evaluate = goodsEvaluateService.getOne(new LambdaQueryWrapper<GoodsEvaluate>()
.eq(GoodsEvaluate::getDelFlag, 0)
.eq(GoodsEvaluate::getOrderId, orderId));
- for (GoodsEvaluate goodsEvaluate : list) {
- Goods goods = goodsService.getById(goodsEvaluate.getGoodsId());
- goodsEvaluate.setGoodsName(goods.getName());
- goodsEvaluate.setGoodsImg(goods.getHomePagePicture());
+ if(evaluate==null){
+ return R.fail("未评价");
}
- return R.ok(list);
+ Goods goods = goodsService.getById(evaluate.getGoodsId());
+ evaluate.setGoodsName(goods.getName());
+ evaluate.setGoodsImg(goods.getHomePagePicture());
+
+ return R.ok(evaluate);
}
/**
- * 删除评论
+ * 删除评价
*/
@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();
}
@@ -183,6 +197,7 @@
Goods goods = goodsService.getById(item.getGoodsId());
if(null != goods){
item.setGoodsName(goods.getName());
+ item.setGoodsImg(goods.getHomePagePicture());
}
}
@@ -190,9 +205,12 @@
* 评论详情
*/
@GetMapping("/{id}")
- @ApiOperation(value = "评论详情", tags = {"管理后台-商品管理-评价管理"})
+ @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