From dc3a923dcf09ba9ae0e46fa0916ac70d258d7b70 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 25 Aug 2025 16:23:51 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java | 117 +++++++++++++++++++++++++++-------------------------------
1 files changed, 54 insertions(+), 63 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
index 2a8d088..e3414d3 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
@@ -1,84 +1,75 @@
package com.oying.modules.message.rest;
-import com.oying.annotation.Log;
-import com.oying.modules.message.domain.MesOrderEvaluation;
-import com.oying.modules.message.domain.MesOrderItemEvaluationDto;
import com.oying.modules.message.domain.myDto.MesOrderEvaluationDto;
import com.oying.modules.message.service.MesOrderEvaluationService;
-import com.oying.modules.message.domain.dto.MesOrderEvaluationQueryCriteria;
import com.oying.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @date 2025-07-25
+ **/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+@Api(tags = "消息中心2.0")
@RequestMapping("/api/mesOrderEvaluation")
public class MesOrderEvaluationController {
private final MesOrderEvaluationService mesOrderEvaluationService;
-
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('mesOrderEvaluation:list')")
- public void exportMesOrderEvaluation(HttpServletResponse response, MesOrderEvaluationQueryCriteria criteria) throws IOException {
- mesOrderEvaluationService.download(mesOrderEvaluationService.queryAll(criteria), response);
- }
-
- @GetMapping
- @ApiOperation("查询消息")
- @PreAuthorize("@el.check('mesOrderEvaluation:list')")
- public ResponseEntity<PageResult<MesOrderEvaluation>> queryMesOrderEvaluation(MesOrderEvaluationQueryCriteria criteria){
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(mesOrderEvaluationService.queryAll(criteria,page),HttpStatus.OK);
- }
-
- @PostMapping
- @Log("新增消息")
- @ApiOperation("新增消息")
- @PreAuthorize("@el.check('mesOrderEvaluation:add')")
- public ResponseEntity<Object> createMesOrderEvaluation(@Validated @RequestBody MesOrderEvaluation resources){
- mesOrderEvaluationService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改消息")
- @ApiOperation("修改消息")
- @PreAuthorize("@el.check('mesOrderEvaluation:edit')")
- public ResponseEntity<Object> updateMesOrderEvaluation(@Validated @RequestBody MesOrderEvaluation resources){
- mesOrderEvaluationService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除消息")
- @ApiOperation("删除消息")
- @PreAuthorize("@el.check('mesOrderEvaluation:del')")
- public ResponseEntity<Object> deleteMesOrderEvaluation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- mesOrderEvaluationService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
+//
+// @ApiOperation("导出数据")
+// @GetMapping(value = "/download")
+// @PreAuthorize("@el.check('mesOrderEvaluation:list')")
+// public void exportMesOrderEvaluation(HttpServletResponse response, MesOrderEvaluationQueryCriteria criteria) throws IOException {
+// mesOrderEvaluationService.download(mesOrderEvaluationService.queryAll(criteria), response);
+// }
+//
+// @GetMapping
+// @ApiOperation("查询消息")
+// @PreAuthorize("@el.check('mesOrderEvaluation:list')")
+// public ResponseEntity<PageResult<MesOrderEvaluation>> queryMesOrderEvaluation(MesOrderEvaluationQueryCriteria criteria){
+// Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+// return new ResponseEntity<>(mesOrderEvaluationService.queryAll(criteria,page),HttpStatus.OK);
+// }
+//
+// @PostMapping
+// @Log("新增消息")
+// @ApiOperation("新增消息")
+// @PreAuthorize("@el.check('mesOrderEvaluation:add')")
+// public ResponseEntity<Object> createMesOrderEvaluation(@Validated @RequestBody MesOrderEvaluation resources){
+// mesOrderEvaluationService.create(resources);
+// return new ResponseEntity<>(HttpStatus.CREATED);
+// }
+//
+// @PutMapping
+// @Log("修改消息")
+// @ApiOperation("修改消息")
+// @PreAuthorize("@el.check('mesOrderEvaluation:edit')")
+// public ResponseEntity<Object> updateMesOrderEvaluation(@Validated @RequestBody MesOrderEvaluation resources){
+// mesOrderEvaluationService.update(resources);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// }
+//
+// @DeleteMapping
+// @Log("删除消息")
+// @ApiOperation("删除消息")
+// @PreAuthorize("@el.check('mesOrderEvaluation:del')")
+// public ResponseEntity<Object> deleteMesOrderEvaluation(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+// mesOrderEvaluationService.deleteAll(ids);
+// return new ResponseEntity<>(HttpStatus.OK);
+// }
//对一个店铺评价 + 打分
//order_eval_id, order_item_id, goods_id, goods_name, goods_pic, score, content, imgs, buyer_id
@PostMapping("/addShopEvaluation")
- @ApiOperation("对一个商品评价 + 打分")
- public R<Object> addGoodsEvaluation(@RequestBody MesOrderEvaluationDto resources){
+ @ApiOperation("对一个店铺评价 + 打分")
+ public R<Object> addGoodsEvaluation(@RequestBody MesOrderEvaluationDto resources) {
try {
mesOrderEvaluationService.addShopEvaluation(resources);
return R.success();
--
Gitblit v1.9.3