From 8014574aa8a6abe96ad1ad5bb39a2b55547c84f8 Mon Sep 17 00:00:00 2001
From: leomon <2233021400@qq.com>
Date: Wed, 04 Jun 2025 23:15:36 +0800
Subject: [PATCH] 微信小程序发送订阅消息给客户

---
 oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderBuyerController.java |   95 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 65 insertions(+), 30 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..2022119 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
@@ -21,20 +21,21 @@
 * @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("查询买家端订单消息通知")
@@ -44,30 +45,64 @@
         return new ResponseEntity<>(messageOrderBuyerService.queryAll(criteria,page),HttpStatus.OK);
     }
 
-    @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 ResponseEntity<String> getMessageOrderBuyer(@PathVariable Integer order_id) {
+        MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
+        String message = messageOrderBuyer.getMessageType();
+
+        return new ResponseEntity<>(message, HttpStatus.OK);
+    }
+    //订单送达通知
+    @GetMapping("/deliver/{order_id}")
+    @ApiOperation("查询一条订单送达通知")
+    public ResponseEntity<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);
+        }else{
+            //返回没送达
+            return new ResponseEntity<>("没送达", HttpStatus.OK);
+        }
+    }
+    //实现点击跳转到订单详情
+    @GetMapping("/link/{order_id}")
+    @ApiOperation("点击跳转到订单详情")
+    public ResponseEntity<String> getMessageOrderBuyerLink(@PathVariable Integer order_id) {
+        MessageOrderBuyer messageOrderBuyer = messageOrderBuyerService.findByOrderId(order_id);
+        String link = messageOrderBuyer.getLink();
+        return new ResponseEntity<>(link, HttpStatus.OK);
     }
 
-    @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