From e0fc8f7e2230b51e3bbe8dea43790cf11b7170e9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 04 十一月 2024 15:39:01 +0800
Subject: [PATCH] merge
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java | 108 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 99 insertions(+), 9 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 0602455..1db4d3a 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
@@ -1,21 +1,27 @@
package com.ruoyi.order.controller;
-import com.ruoyi.common.core.domain.R;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.order.api.model.TOrderEvaluate;
+import com.ruoyi.order.api.model.TOrderEvaluateTag;
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.other.api.feignClient.TEvaluationTagClient;
+import com.ruoyi.order.service.TOrderEvaluateTagService;
+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.ApiParam;
+import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -33,12 +39,17 @@
@Autowired
private TOrderEvaluateService orderEvaluateService;
+
+ @Resource
+ private TOrderEvaluateTagService orderEvaluateTagService;
+
+
@ApiOperation(tags = {"小程序-订单评价"},value = "充电订单评价标签及数量查询")
- @PostMapping(value = "/getTagCount")
- public AjaxResult<List<TEvaluationTagVO>> getTagCount() {
- return AjaxResult.ok(orderEvaluateService.getTagCount());
+ @GetMapping(value = "/getTagCount")
+ public AjaxResult<List<TEvaluationTagVO>> getTagCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id")Integer siteId) {
+ return AjaxResult.ok(orderEvaluateService.getTagCount(siteId));
}
@ApiOperation(tags = {"小程序-订单评价"},value = "充电订单评价分页列表查询")
@@ -46,12 +57,91 @@
public AjaxResult<PageInfo<TOrderEvaluateVO>> pageList(@RequestBody TOrderEvaluateQuery query) {
return AjaxResult.ok(orderEvaluateService.getTagList(query));
}
+
+
+
+
+
+
+
+ @PostMapping(value = "/getPageList")
+ @ApiOperation(value = "获取充电评价列表", tags = {"管理后台-充电评价"})
+ public AjaxResult<PageInfo<GetOrderEvaluatePageListDTO>> getPageList(@RequestBody GetOrderEvaluatePageList pageList){
+ PageInfo<GetOrderEvaluatePageListDTO> list = orderEvaluateService.getPageList(pageList);
+ return AjaxResult.success(list);
+ }
+
+
+
+ @DeleteMapping(value = "/delOrderEvaluate/{id}")
+ @ApiOperation(value = "删除充电评价", tags = {"管理后台-充电评价"})
+ public AjaxResult delOrderEvaluate(@PathVariable("id") Long id){
+ TOrderEvaluate orderEvaluate = orderEvaluateService.getById(id);
+ orderEvaluateService.removeById(orderEvaluate);
+ orderEvaluateTagService.remove(new LambdaQueryWrapper<TOrderEvaluateTag>().eq(TOrderEvaluateTag::getOrderEvaluateId, id));
+ return AjaxResult.success();
+ }
+
+
+
+
+ @PostMapping(value = "/replyEvaluation")
+ @ApiOperation(value = "充电评价回复", tags = {"管理后台-充电评价"})
+ public AjaxResult replyEvaluation(@RequestBody ReplyEvaluationVO vo){
+ TOrderEvaluate orderEvaluate = orderEvaluateService.getById(vo.getId());
+ String reply = vo.getReply().replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #39;", "'")
+ .replaceAll("& lt;", "<")
+ .replaceAll("& gt;", ">");
+ orderEvaluate.setEvaluationResponse(reply);
+ orderEvaluate.setResponseTime(LocalDateTime.now());
+ orderEvaluateService.updateById(orderEvaluate);
+ return AjaxResult.success();
+ }
+
+
+
+
+ @DeleteMapping(value = "/delOrderEvaluateReply/{id}")
+ @ApiOperation(value = "删除充电评价回复", tags = {"管理后台-充电评价"})
+ 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(String orderId, Integer orderType){
+ OrderEvaluateVo orderEvaluate = orderEvaluateService.getOrderEvaluate(orderId, orderType);
+ return AjaxResult.success(orderEvaluate);
+ }
+
+
}
--
Gitblit v1.7.1