From 35cc96f68c3a33288351baba158feb9fec94a5d1 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 10:40:04 +0800
Subject: [PATCH] 骑手到店上报、已取商品
---
oying-system/src/main/java/com/oying/modules/message/rest/MessageOrderSellerController.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 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 80456f1..e73785e 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
@@ -1,13 +1,17 @@
package com.oying.modules.message.rest;
+import cn.hutool.core.bean.BeanUtil;
import com.oying.annotation.Log;
import com.oying.modules.message.domain.MessageOrderSeller;
import com.oying.modules.message.domain.MessageOrderSeller;
+import com.oying.modules.message.domain.dto.MessageOrderSellerDTO;
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.apache.poi.util.Beta;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -74,16 +78,58 @@
// return new ResponseEntity<>(HttpStatus.OK);
// }
- //订单状态变化通知
- @GetMapping("/status/{order_id}")
- @ApiOperation("查询一条订单状态变化通知")
- public R<String> getMessageOrderSeller(@PathVariable Integer order_id) {
- MessageOrderSeller messageOrderSeller = messageOrderSellerService.findByOrderId(order_id);
- String message = messageOrderSeller.getMessageType();
+// //订单状态变化通知
+// @GetMapping("/status/{order_id}")
+// @ApiOperation("查询一条订单状态变化通知")
+// 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 R.success(message);
+// }
+ //根据store_id 返回list订单状态变化通知
+ @GetMapping("/status/store/{store_id}")
+ @ApiOperation("根据store_id 返回list订单状态变化通知")
+ public R<List<MessageOrderSellerDTO>> getMessageOrderSeller(@PathVariable String store_id) {
+ List<MessageOrderSeller> messageOrderSeller = messageOrderSellerService.findByStoreId(store_id);
+ //转换为MessageOrderSellerDTO huto tools
+ List<MessageOrderSellerDTO> dtoList = BeanUtil.copyToList(messageOrderSeller, MessageOrderSellerDTO.class);
+ //判断store_id存在
+ if (messageOrderSeller == null) {
+ return R.fail("store_id不存在");
+ }else{return R.success(dtoList);}
-// return new ResponseEntity<>(message, HttpStatus.OK);
- return R.success(message);
}
+ //让前端标记已读
+ @PostMapping("/read/{order_id}")
+ @ApiOperation("让前端标记已读 按条")
+ public R<String> getMessageOrderSellerRead(@PathVariable Integer order_id) {
+ if(messageOrderSellerService.updateMessageOrderSellerRead(order_id)){
+ return R.success("已读");
+ }else{
+ return R.fail("id不存在");
+ }
+
+
+ }
+ @Beta//重复值处理
+ //让后端队友更新我的表
+ @PostMapping("/update/seller")
+ @ApiOperation("更新插入消息表")
+ public R<String> updateMessageOrderSeller(@RequestBody MessageOrderSeller resources) {
+ //插入一条数据
+ if(messageOrderSellerService.saveMessageOrderSellerByOrderIdAndStoreId(resources))
+ return R.success("更新成功");
+ return R.fail("更新失败");
+
+ }
+
+
+
+
+
+
//订单送达通知
@GetMapping("/deliver/{order_id}")
@ApiOperation("查询一条订单送达通知")
--
Gitblit v1.9.3