Merge branch 'refs/heads/master' into xin

xin

2025-09-12 8849a8a7032079df128f0c530fd4368cfbc75d81

 oying-system/src/main/java/com/oying/modules/message/service/MesMsgRecordService.java

@@ -2,12 +2,14 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.message.common.OrderStatusEnum;
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;
@@ -75,11 +77,38 @@
    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);

}