Merge branch 'pxb' into xin

xin

2025-09-15 07234fed2dc993366fd4c7673d0e8ada90706bd1

 oying-system/src/main/java/com/oying/modules/message/mapper/MesMsgRecordMapper.java

@@ -1,23 +1,22 @@
package com.oying.modules.message.mapper;

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.List;

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 org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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 org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
* @author 李萌
* @date 2025-07-25
**/
 * @author 李萌
 * @date 2025-07-25
 **/
@Mapper
public interface MesMsgRecordMapper extends BaseMapper<MesMsgRecord> {

@@ -25,14 +24,23 @@

    List<MesMsgRecord> findAll(@Param("criteria") MesMsgRecordQueryCriteria criteria);

    List<MesMsgRecordQueryPollDto> PollMes(Long platform);

    void batchMarkRead(Long platform,List<Long> msgIds);
    List<MesMsgRecordQueryPollDto> PollMes(@Param("platform") Long platform, @Param("msgType") Long msgType);

    IPage<MesMsgRecordQuerySystemDto> queryAllSysNotice(@Param("criteria")MesMsgRecordQueryCriteria criteria, Page<Object> page);

    void batchMarkRead(Long platform, List<Long> msgIds);

    IPage<MesMsgRecordQuerySystemDto> queryAllSysNotice(@Param("criteria") MesMsgRecordQueryCriteria criteria, Page<Object> page);

    List<MesMsgRecordQueryOrderDto> queryorder(Long shopId);

    List<MesMsgRecordQueryPollDto> PollMesAll(@Param("platform") Long platform);

    List<MesMsgRecordQueryOrderDto> queryorderPending(Long shopId, String content);

    List<MesMsgRecordQueryOrderDto> queryBuyerOrderMessages(Long buyerId);

    List<MesMsgRecordQueryOrderDto> queryBuyerOrderMessagesComplete(Long buyerId);


//    IPage<MesMsgRecord> findAll(@Param("criteria") MesMsgRecordQueryCriteria criteria, Page<Object> page);