From 6e0a83c55db4bae4d23a4c281946bda1d610f678 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Sat, 14 Jun 2025 12:32:31 +0800
Subject: [PATCH] 补充前次提交的遗漏内容，前次提交SHA：a6f4dd
---
oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java
index 81a7f07..ad275c2 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java
@@ -4,6 +4,7 @@
import com.oying.modules.message.domain.MessageOrderBuyer;
import com.oying.modules.message.service.MessageOrderBuyerService;
import com.oying.modules.message.domain.dto.MessageOrderBuyerQueryCriteria;
+import com.oying.utils.R;
import lombok.RequiredArgsConstructor;
import java.util.List;
import org.springframework.http.HttpStatus;
@@ -21,6 +22,7 @@
* @author 李萌
* @date 2025-05-20
**/
+//todo
@RestController
@RequiredArgsConstructor
@Api(tags = "买家端订单消息通知")
@@ -39,9 +41,11 @@
@GetMapping
@ApiOperation("查询买家端订单消息通知")
@PreAuthorize("@el.check('messageOrderBuyer:list')")
- public ResponseEntity<PageResult<MessageOrderBuyer>> queryMessageOrderBuyer(MessageOrderBuyerQueryCriteria criteria){
+ public R<PageResult<MessageOrderBuyer>> queryMessageOrderBuyer(MessageOrderBuyerQueryCriteria criteria){
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(messageOrderBuyerService.queryAll(criteria,page),HttpStatus.OK);
+// return new ResponseEntity<>(messageOrderBuyerService.queryAll(criteria,page),HttpStatus.OK);
+
+ return R.success(messageOrderBuyerService.queryAll(criteria,page));
}
// @PostMapping
@@ -73,34 +77,41 @@
//订单状态变化通知
@GetMapping("/status/{order_id}")
@ApiOperation("查询一条订单状态变化通知")
- public ResponseEntity<String> getMessageOrderBuyer(@PathVariable Integer order_id) {
+ public R<String> getMessageOrderBuyer(@PathVariable Integer order_id) {
MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
- String message = messageOrderBuyer.getMessageType();
+ if (messageOrderBuyer != null) {
+ String message = messageOrderBuyer.getMessageType();
+ return R.success(message);
+ } else {
+ return R.fail("订单状态变化通知不存在");
+ }
- return new ResponseEntity<>(message, HttpStatus.OK);
}
//订单送达通知
@GetMapping("/deliver/{order_id}")
@ApiOperation("查询一条订单送达通知")
- public ResponseEntity<String> getMessageOrderBuyerDeliver(@PathVariable Integer order_id) {
+ public R<String> getMessageOrderBuyerDeliver(@PathVariable Integer order_id) {
MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
String message = messageOrderBuyer.getMessageType();
//如果MessageType为订单送达，则返回message——content
if (message.equals("订单送达")) {
String messageContent = messageOrderBuyer.getMessageContent();
- return new ResponseEntity<>(messageContent, HttpStatus.OK);
+ return R.success(messageContent);
+// return new ResponseEntity<>(messageContent, HttpStatus.OK);
}else{
//返回没送达
- return new ResponseEntity<>("没送达", HttpStatus.OK);
+ return R.fail("没送达");
+// return new ResponseEntity<>("没送达", HttpStatus.OK);
}
}
//实现点击跳转到订单详情
@GetMapping("/link/{order_id}")
@ApiOperation("点击跳转到订单详情")
- public ResponseEntity<String> getMessageOrderBuyerLink(@PathVariable Integer order_id) {
+ public R<String> getMessageOrderBuyerLink(@PathVariable Integer order_id) {
MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
String link = messageOrderBuyer.getLink();
- return new ResponseEntity<>(link, HttpStatus.OK);
+// return new ResponseEntity<>(link, HttpStatus.OK);
+ return R.success(link);
}
--
Gitblit v1.9.3