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/MessageOrderSellerController.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java
index 33909f6..80456f1 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java
@@ -5,6 +5,7 @@
 import com.oying.modules.message.domain.MessageOrderSeller;
 import com.oying.modules.message.service.MessageOrderSellerService;
 import com.oying.modules.message.domain.dto.MessageOrderSellerQueryCriteria;
+import com.oying.utils.R;
 import lombok.RequiredArgsConstructor;
 import java.util.List;
 import org.springframework.http.HttpStatus;
@@ -40,9 +41,10 @@
     @GetMapping
     @ApiOperation("查询卖家端订单消息通知")
     @PreAuthorize("@el.check('messageOrderSeller:list')")
-    public ResponseEntity<PageResult<MessageOrderSeller>> queryMessageOrderSeller(MessageOrderSellerQueryCriteria criteria){
+    public R<PageResult<MessageOrderSeller>> queryMessageOrderSeller(MessageOrderSellerQueryCriteria criteria){
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-        return new ResponseEntity<>(messageOrderSellerService.queryAll(criteria,page),HttpStatus.OK);
+//        return new ResponseEntity<>(messageOrderSellerService.queryAll(criteria,page),HttpStatus.OK);
+        return R.success(messageOrderSellerService.queryAll(criteria,page));
     }
 
 //    @PostMapping
@@ -75,34 +77,38 @@
     //订单状态变化通知
     @GetMapping("/status/{order_id}")
     @ApiOperation("查询一条订单状态变化通知")
-    public ResponseEntity<String> getMessageOrderSeller(@PathVariable Integer order_id) {
+    public R<String> getMessageOrderSeller(@PathVariable Integer order_id) {
         MessageOrderSeller messageOrderSeller = messageOrderSellerService.findByOrderId(order_id);
         String message = messageOrderSeller.getMessageType();
 
-        return new ResponseEntity<>(message, HttpStatus.OK);
+//        return new ResponseEntity<>(message, HttpStatus.OK);
+        return R.success(message);
     }
     //订单送达通知
     @GetMapping("/deliver/{order_id}")
     @ApiOperation("查询一条订单送达通知")
-    public ResponseEntity<String> getMessageOrderSellerDeliver(@PathVariable Integer order_id) {
+    public R<String> getMessageOrderSellerDeliver(@PathVariable Integer order_id) {
         MessageOrderSeller messageOrderSeller = messageOrderSellerService.findByOrderId(order_id);
         String message = messageOrderSeller.getMessageType();
         //如果MessageType为订单送达,则返回message——content
         if (message.equals("买家下单")) {
             String messageContent = messageOrderSeller.getMessageContent();
-            return new ResponseEntity<>(messageContent, HttpStatus.OK);
+//            return new ResponseEntity<>(messageContent, HttpStatus.OK);
+            return R.success(messageContent);
         }else{
             //返回没送达
-            return new ResponseEntity<>("买家没下单", HttpStatus.OK);
+//            return new ResponseEntity<>("买家没下单", HttpStatus.OK);
+            return R.fail("没送达");
         }
     }
     //实现点击跳转到订单详情
     @GetMapping("/link/{order_id}")
     @ApiOperation("点击跳转到订单详情")
-    public ResponseEntity<String> getMessageOrderSellerLink(@PathVariable Integer order_id) {
+    public R<String> getMessageOrderSellerLink(@PathVariable Integer order_id) {
         MessageOrderSeller messageOrderSeller = messageOrderSellerService.findByOrderId(order_id);
         String link = messageOrderSeller.getLink();
-        return new ResponseEntity<>(link, HttpStatus.OK);
+//        return new ResponseEntity<>(link, HttpStatus.OK);
+        return R.success(link);
     }
 
 }

--
Gitblit v1.9.3