From d0e96daddf8d06900c468ee71a8ee4f14fc1c980 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 24 八月 2024 10:28:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 844f56e..ab31311 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
@@ -9,11 +9,10 @@
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.other.api.vo.TEvaluationTagVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -68,8 +67,7 @@
@ApiOperation(value = "删除充电评价", tags = {"管理后台-充电评价"})
public AjaxResult delOrderEvaluate(@PathVariable Long id){
TOrderEvaluate orderEvaluate = orderEvaluateService.getById(id);
- orderEvaluate.setDelFlag(true);
- orderEvaluateService.updateById(orderEvaluate);
+ orderEvaluateService.removeById(orderEvaluate);
return AjaxResult.success();
}
@@ -111,6 +109,28 @@
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(@PathVariable Integer orderId, Integer orderType){
+ OrderEvaluateVo orderEvaluate = orderEvaluateService.getOrderEvaluate(orderId, orderType);
+ return AjaxResult.success(orderEvaluate);
+ }
+
+
}
--
Gitblit v1.7.1