From a3fffa17c643bb96159a23880e1749c486279906 Mon Sep 17 00:00:00 2001
From: leomon <2233021400@qq.com>
Date: Thu, 05 Jun 2025 00:32:29 +0800
Subject: [PATCH] 消息中心统一 响应R
---
oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java
index 8d3dfe9..ae2c2ac 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderLeaveController.java
@@ -6,6 +6,7 @@
import com.oying.modules.message.domain.MessageOrderLeave;
import com.oying.modules.message.service.MessageOrderLeaveService;
import com.oying.modules.message.domain.dto.MessageOrderLeaveQueryCriteria;
+import com.oying.utils.R;
import lombok.RequiredArgsConstructor;
import java.sql.Timestamp;
@@ -43,10 +44,12 @@
@GetMapping
@ApiOperation("查询消息留言")
@PreAuthorize("@el.check('messageOrderLeave:list')")
- public ResponseEntity<PageResult<MessageOrderLeave>> queryMessageOrderLeave(MessageOrderLeaveQueryCriteria criteria){
+ public R<PageResult<MessageOrderLeave>> queryMessageOrderLeave(MessageOrderLeaveQueryCriteria criteria){
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(messageOrderLeaveService.queryAll(criteria,page),HttpStatus.OK);
+// return new ResponseEntity<>(messageOrderLeaveService.queryAll(criteria,page),HttpStatus.OK);
+ return R.success(messageOrderLeaveService.queryAll(criteria,page));
}
+
// @PostMapping
// @Log("新增消息留言")
@@ -100,13 +103,14 @@
@PutMapping("/customer/{order_id}")
@ApiOperation("顾客点击订单，传回订单id，根据订单id更新一条留言")
- public ResponseEntity<Object> updateMessageOrderLeaveCustomer(@PathVariable("order_id") Integer id, @RequestBody MessageOrderLeave messageOrderLeave1) {
+ public R<Object> updateMessageOrderLeaveCustomer(@PathVariable("order_id") Integer id, @RequestBody MessageOrderLeave messageOrderLeave1) {
// 根据 order_id 查找留言信息
MessageOrderLeave messageOrderLeave = messageOrderLeaveService.findByOrderId(id);
// 如果留言信息不存在，返回 404 Not Found
if (messageOrderLeave == null) {
- return new ResponseEntity<>("Message order leave not found for order ID: " + id, HttpStatus.NOT_FOUND);
+// return new ResponseEntity<>("Message order leave not found for order ID: " + id, HttpStatus.NOT_FOUND);
+ return R.fail("Message order leave not found for order ID: " + id);
}
// 设置顾客评价内容
@@ -124,10 +128,12 @@
// 如果更新失败，返回 500 Internal Server Error
if (!updated) {
- return new ResponseEntity<>("Failed to update message order leave", HttpStatus.INTERNAL_SERVER_ERROR);
+// return new ResponseEntity<>("Failed to update message order leave", HttpStatus.INTERNAL_SERVER_ERROR);
+ return R.fail("Failed to update message order leave");
}
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return R.success(messageOrderLeave);
}
//商家对订单id进行回复
// @PutMapping("/seller/{order_id}")
@@ -164,14 +170,16 @@
//商家对订单id进行回复 订单id必须唯一限制 否则会报错
@PutMapping("/seller/{order_id}")
@ApiOperation("商家对订单id进行回复")
- public ResponseEntity<Object> updateMessageOrderLeaveSeller(@PathVariable("order_id") Integer id, @RequestBody MessageOrderLeave messageOrderLeave1) {
+ public R<Object> updateMessageOrderLeaveSeller(@PathVariable("order_id") Integer id, @RequestBody MessageOrderLeave messageOrderLeave1) {
// 根据 order_id 查找留言信息
MessageOrderLeave messageOrderLeave = messageOrderLeaveService.findByOrderId(id);
// 如果没有找到对应的留言信息，返回 404 Not Found
if (messageOrderLeave == null) {
- return new ResponseEntity<>("Message order leave not found for order ID: " + id, HttpStatus.NOT_FOUND);
+// return new ResponseEntity<>("Message order leave not found for order ID: " + id, HttpStatus.NOT_FOUND);
+ return R.fail("Message order leave not found for order ID: " + id);
}
+
// 设置商家回复内容
messageOrderLeave.setSellerReply(messageOrderLeave1.getSellerReply());
@@ -183,10 +191,12 @@
// 如果更新失败，返回 500 Internal Server Error
if (!updated) {
- return new ResponseEntity<>("Failed to update message order leave", HttpStatus.INTERNAL_SERVER_ERROR);
+// return new ResponseEntity<>("Failed to update message order leave", HttpStatus.INTERNAL_SERVER_ERROR);
+ return R.fail("Failed to update message order leave");
}
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return R.success(messageOrderLeave);
}
}
--
Gitblit v1.9.3