From d2230c638cc57b7dc4fa4570e79cbc93107926b0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 15:44:38 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 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 20cc001..8b7a5c7 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
@@ -5,13 +5,15 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TOrderEvaluate;
import com.ruoyi.order.api.query.TOrderEvaluateQuery;
+import com.ruoyi.order.api.vo.SiteDetailEvaluateVO;
import com.ruoyi.order.api.vo.TOrderEvaluateVO;
import com.ruoyi.order.dto.GetOrderEvaluatePageList;
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.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,7 +38,7 @@
@ApiOperation(tags = {"小程序-订单评价"},value = "充电订单评价标签及数量查询")
- @PostMapping(value = "/getTagCount")
+ @GetMapping(value = "/getTagCount")
public AjaxResult<List<TEvaluationTagVO>> getTagCount() {
return AjaxResult.ok(orderEvaluateService.getTagCount());
}
@@ -53,7 +55,7 @@
- @GetMapping(value = "/getPageList")
+ @PostMapping(value = "/getPageList")
@ApiOperation(value = "获取充电评价列表", tags = {"管理后台-充电评价"})
public AjaxResult<PageInfo<GetOrderEvaluatePageListDTO>> getPageList(@RequestBody GetOrderEvaluatePageList pageList){
PageInfo<GetOrderEvaluatePageListDTO> list = orderEvaluateService.getPageList(pageList);
@@ -62,12 +64,11 @@
- @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);
- orderEvaluate.setDelFlag(true);
- orderEvaluateService.updateById(orderEvaluate);
+ 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,14 +95,43 @@
- @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);
return AjaxResult.success();
}
+
+ @ApiOperation(tags = {"小程序-订单评价"},value = "电站详情中评价列表查询")
+ @GetMapping(value = "/getSiteDetailEveList")
+ public AjaxResult<SiteDetailEvaluateVO> getSiteDetailEveList(@RequestParam(value = "siteId")@ApiParam(value = "站点id")Integer siteId) {
+ return AjaxResult.ok(orderEvaluateService.getSiteDetailEveList(siteId));
+ }
+
+
+
+
+ @PostMapping(value = "/addOrderEvaluate")
+ @ApiOperation(value = "添加评价记录", tags = {"小程序-充电记录"})
+ public AjaxResult addOrderEvaluate(@RequestBody OrderEvaluateVo query){
+ return orderEvaluateService.addOrderEvaluate(query);
+ }
+
+
+ @GetMapping(value = "/getOrderEvaluate")
+ @ApiOperation(value = "获取订单评价详情", tags = {"小程序-充电记录"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true),
+ @ApiImplicitParam(value = "订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）", name = "orderType", required = true),
+ })
+ public AjaxResult<OrderEvaluateVo> getOrderEvaluate(Integer orderId, Integer orderType){
+ OrderEvaluateVo orderEvaluate = orderEvaluateService.getOrderEvaluate(orderId, orderType);
+ return AjaxResult.success(orderEvaluate);
+ }
+
+
}
--
Gitblit v1.7.1