From 982313135d1c239fe3b20e4c5664781f92d40aca Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:17:39 +0800
Subject: [PATCH] Merge branch 'master' into xin

---
 oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java |   90 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 insertions(+), 0 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
new file mode 100644
index 0000000..2a8d088
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
@@ -0,0 +1,90 @@
+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 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;
+
+/**
+* @author 李萌
+* @date 2025-07-25
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "消息")
+@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);
+    }
+
+    //对一个店铺评价 + 打分
+    //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){
+        try {
+            mesOrderEvaluationService.addShopEvaluation(resources);
+            return R.success();
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+
+    }
+}

--
Gitblit v1.9.3