From 0ef280ca1db4c8f280be5030ccfea35441ca1e51 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Wed, 16 Jul 2025 11:24:29 +0800
Subject: [PATCH] 骑手同步数接口修改
---
oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java | 109 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 32 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 5f6278d..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,53 +22,97 @@
* @author 李萌
* @date 2025-05-20
**/
+//todo
@RestController
@RequiredArgsConstructor
@Api(tags = "买家端订单消息通知")
-@RequestMapping("/api/messageOrderBuyer")
+@RequestMapping("/api/message/messageOrderBuyer")
public class MessageOrderBuyerController {
private final MessageOrderBuyerService messageOrderBuyerService;
- @ApiOperation("导出数据")
- @GetMapping(value = "/download")
- @PreAuthorize("@el.check('messageOrderBuyer:list')")
- public void exportMessageOrderBuyer(HttpServletResponse response, MessageOrderBuyerQueryCriteria criteria) throws IOException {
- messageOrderBuyerService.download(messageOrderBuyerService.queryAll(criteria), response);
- }
+// @ApiOperation("导出数据")
+// @GetMapping(value = "/download")
+// @PreAuthorize("@el.check('messageOrderBuyer:list')")
+// public void exportMessageOrderBuyer(HttpServletResponse response, MessageOrderBuyerQueryCriteria criteria) throws IOException {
+// messageOrderBuyerService.download(messageOrderBuyerService.queryAll(criteria), response);
+// }
@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
- @Log("新增买家端订单消息通知")
- @ApiOperation("新增买家端订单消息通知")
- @PreAuthorize("@el.check('messageOrderBuyer:add')")
- public ResponseEntity<Object> createMessageOrderBuyer(@Validated @RequestBody MessageOrderBuyer resources){
- messageOrderBuyerService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+// @PostMapping
+// @Log("新增买家端订单消息通知")
+// @ApiOperation("新增买家端订单消息通知")
+// @PreAuthorize("@el.check('messageOrderBuyer:add')")
+// public ResponseEntity<Object> createMessageOrderBuyer(@Validated @RequestBody MessageOrderBuyer resources){
+// messageOrderBuyerService.create(resources);
+// return new ResponseEntity<>(HttpStatus.CREATED);
+// }
+//
+// @PutMapping
+// @Log("修改买家端订单消息通知")
+// @ApiOperation("修改买家端订单消息通知")
+// @PreAuthorize("@el.check('messageOrderBuyer:edit')")
+// public ResponseEntity<Object> updateMessageOrderBuyer(@Validated @RequestBody MessageOrderBuyer resources){
+// messageOrderBuyerService.update(resources);
+// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+// }
+//
+// @DeleteMapping
+// @Log("删除买家端订单消息通知")
+// @ApiOperation("删除买家端订单消息通知")
+// @PreAuthorize("@el.check('messageOrderBuyer:del')")
+// public ResponseEntity<Object> deleteMessageOrderBuyer(@ApiParam(value = "传ID数组[]") @RequestBody List<Integer> ids) {
+// messageOrderBuyerService.deleteAll(ids);
+// return new ResponseEntity<>(HttpStatus.OK);
+// }
+ //订单状态变化通知
+ @GetMapping("/status/{order_id}")
+ @ApiOperation("查询一条订单状态变化通知")
+ public R<String> getMessageOrderBuyer(@PathVariable Integer order_id) {
+ MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
+ if (messageOrderBuyer != null) {
+ String message = messageOrderBuyer.getMessageType();
+ return R.success(message);
+ } else {
+ return R.fail("订单状态变化通知不存在");
+ }
+
+ }
+ //订单送达通知
+ @GetMapping("/deliver/{order_id}")
+ @ApiOperation("查询一条订单送达通知")
+ 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 R.success(messageContent);
+// return new ResponseEntity<>(messageContent, HttpStatus.OK);
+ }else{
+ //返回没送达
+ return R.fail("没送达");
+// return new ResponseEntity<>("没送达", HttpStatus.OK);
+ }
+ }
+ //实现点击跳转到订单详情
+ @GetMapping("/link/{order_id}")
+ @ApiOperation("点击跳转到订单详情")
+ 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 R.success(link);
}
- @PutMapping
- @Log("修改买家端订单消息通知")
- @ApiOperation("修改买家端订单消息通知")
- @PreAuthorize("@el.check('messageOrderBuyer:edit')")
- public ResponseEntity<Object> updateMessageOrderBuyer(@Validated @RequestBody MessageOrderBuyer resources){
- messageOrderBuyerService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
- @DeleteMapping
- @Log("删除买家端订单消息通知")
- @ApiOperation("删除买家端订单消息通知")
- @PreAuthorize("@el.check('messageOrderBuyer:del')")
- public ResponseEntity<Object> deleteMessageOrderBuyer(@ApiParam(value = "传ID数组[]") @RequestBody List<Integer> ids) {
- messageOrderBuyerService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
- }
}
--
Gitblit v1.9.3