From 32a41e7b04e44a9aba33dd3d71fb79364dc6c851 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 25 Aug 2025 18:57:05 +0800
Subject: [PATCH] 消息通知
---
oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java | 114 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 75 insertions(+), 39 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java b/oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java
index eecc38e..c7ae0df 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java
@@ -1,78 +1,114 @@
package com.oying.modules.message.service;
-import com.oying.modules.message.common.OrderStatusEnum;
-import com.oying.modules.message.domain.MesMsgRecord;
-import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.oying.modules.message.common.MesTypeEnum;
+import com.oying.modules.message.common.MsgStatusEnum;
+import com.oying.modules.message.domain.MesMsgRecord;
+import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryPollDto;
import com.oying.modules.message.domain.myDto.MesMsgRecordQuerySystemDto;
+import com.oying.modules.sh.domain.Order;
import com.oying.utils.PageResult;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
/**
-* @description 服务接口
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @description 服务接口
+ * @date 2025-07-25
+ **/
public interface MesMsgRecordService extends IService<MesMsgRecord> {
/**
- * 查询数据分页
- * @param criteria 条件
- * @param page 分页参数
- * @return PageResult
- */
+ * 查询数据分页
+ *
+ * @param criteria 条件
+ * @param page 分页参数
+ * @return PageResult
+ */
PageResult<MesMsgRecord> queryAll(MesMsgRecordQueryCriteria criteria, Page<Object> page);
/**
- * 查询所有数据不分页
- * @param criteria 条件参数
- * @return List<MesMsgRecordDto>
- */
+ * 查询所有数据不分页
+ *
+ * @param criteria 条件参数
+ * @return List<MesMsgRecordDto>
+ */
List<MesMsgRecord> queryAll(MesMsgRecordQueryCriteria criteria);
/**
- * 创建
- * @param resources /
- */
+ * 创建
+ *
+ * @param resources /
+ */
void create(MesMsgRecord resources);
/**
- * 编辑
- * @param resources /
- */
+ * 编辑
+ *
+ * @param resources /
+ */
void update(MesMsgRecord resources);
/**
- * 多选删除
- * @param ids /
- */
+ * 多选删除
+ *
+ * @param ids /
+ */
void deleteAll(List<Long> ids);
/**
- * 导出数据
- * @param all 待导出的数据
- * @param response /
- * @throws IOException /
- */
+ * 导出数据
+ *
+ * @param all 待导出的数据
+ * @param response /
+ * @throws IOException /
+ */
void download(List<MesMsgRecord> all, HttpServletResponse response) throws IOException;
- List<MesMsgRecordQueryPollDto> PollMes(Long platform);
+ List<MesMsgRecordQueryPollDto> PollMes(Long platform, Long mestype);
- void batchMarkRead(Long platform,List<Long> msgIds);
+ void batchMarkRead(Long platform, List<Long> msgIds);
PageResult<MesMsgRecordQuerySystemDto> queryAllSysNotice(MesMsgRecordQueryCriteria criteria, Page<Object> page);
+ List<MesMsgRecordQueryOrderDto> queryorderPending(Long shopId, String content);
+
+ List<MesMsgRecordQueryOrderDto> queryBuyerOrderMessages(Long buyerId);
+
+ List<MesMsgRecordQueryOrderDto> queryBuyerOrderMessagesComplete(Long buyerId);
+
List<MesMsgRecordQueryOrderDto> queryorder(Long shopId);
- //插入订单消息
-// 入参 订单编号 订单状态（内容） 店铺id
- void insertOrderMsg(String orderNo, OrderStatusEnum content, Long shopId);
+ List<MesMsgRecordQueryPollDto> PollMesAll(Long platform);
+
+ /**
+ * 插入订单消息通知
+ * @param order 订单信息 {@link com.oying.modules.sh.domain.Order}
+ * @param content 消息内容
+ * @param typeEnum 消息类型
+ */
+ void insertOrderMsg(Order order, MsgStatusEnum content, MesTypeEnum typeEnum);
+
+ // 设置一个买家状态为下单 买家id name 订单属性 店铺号
+ void setBuyerStatusOrderSubmitted(String buyerId, String buyerName, String orderNo, Long shopId, String riderId, String riderName);
+
+ //设置一个买家状态为送达 买家id name 订单属性 店铺号
+ void setBuyerStatusOrderDelivered(String buyerId, String buyerName, String orderNo, Long shopId, String riderId, String riderName);
+
+ // 设置一个（订单，买家）的 买家状态
+ void setBuyerStatusOrderDelivered(String buyerId, String buyerName, String orderNo, Long shopId, MsgStatusEnum content, String riderId, String riderName);
+
+
+ //设置商家的状态
+ void setSellerStatusOrderDelivered(String buyerId, String buyerName, String orderNo, Long shopId, MsgStatusEnum content, String riderId, String riderName);
+
+ //设置骑手状态
+ void setRiderStatusOrderDelivered(String buyerId, String buyerName, String orderNo, Long shopId, MsgStatusEnum content, String riderId, String riderName);
}
--
Gitblit v1.9.3