From a41e23347029bf69a3f59438749658252de81d2e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 15 十月 2024 09:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
index 924cae7..e2e2faf 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
@@ -11,6 +11,7 @@
import com.ruoyi.order.dto.GetOrderEvaluatePageListDTO;
import com.ruoyi.order.dto.OrderEvaluateVo;
import com.ruoyi.order.service.TOrderEvaluateService;
+import com.ruoyi.order.vo.ReplyEvaluationVO;
import com.ruoyi.other.api.vo.TEvaluationTagVO;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -63,9 +64,9 @@
- @DeleteMapping(value = "/delOrderEvaluate")
+ @DeleteMapping(value = "/delOrderEvaluate/{id}")
@ApiOperation(value = "删除充电评价", tags = {"管理后台-充电评价"})
- public AjaxResult delOrderEvaluate(@PathVariable Long id){
+ public AjaxResult delOrderEvaluate(@PathVariable("id") Long id){
TOrderEvaluate orderEvaluate = orderEvaluateService.getById(id);
orderEvaluateService.removeById(orderEvaluate);
return AjaxResult.success();
@@ -76,9 +77,9 @@
@PostMapping(value = "/replyEvaluation")
@ApiOperation(value = "充电评价回复", tags = {"管理后台-充电评价"})
- public AjaxResult replyEvaluation(@PathVariable("id") Long id, @RequestParam("reply") String reply){
- TOrderEvaluate orderEvaluate = orderEvaluateService.getById(id);
- reply = reply.replaceAll("& #40;", "(")
+ public AjaxResult replyEvaluation(@RequestBody ReplyEvaluationVO vo){
+ TOrderEvaluate orderEvaluate = orderEvaluateService.getById(vo.getId());
+ String reply = vo.getReply().replaceAll("& #40;", "(")
.replaceAll("& #41;", ")")
.replaceAll("& #40;", "(")
.replaceAll("& #41;", ")")
@@ -94,9 +95,9 @@
- @DeleteMapping(value = "/delOrderEvaluateReply")
+ @DeleteMapping(value = "/delOrderEvaluateReply/{id}")
@ApiOperation(value = "删除充电评价回复", tags = {"管理后台-充电评价"})
- public AjaxResult delOrderEvaluateReply(@PathVariable Long id){
+ public AjaxResult delOrderEvaluateReply(@PathVariable("id") Long id){
TOrderEvaluate orderEvaluate = orderEvaluateService.getById(id);
orderEvaluate.setEvaluationResponse("");
orderEvaluateService.updateById(orderEvaluate);
--
Gitblit v1.7.1