From 45271269073ac92f0367943491a07f49f34f315b Mon Sep 17 00:00:00 2001
From: leomonM <2233021400@qq.com>
Date: Fri, 22 Aug 2025 15:20:14 +0800
Subject: [PATCH] key

---
 oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
index 95d4514..bd0752b 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
@@ -1,30 +1,31 @@
 package com.oying.modules.message.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.oying.modules.message.common.MesReadEnum;
 import com.oying.modules.message.common.MesTypeEnum;
 import com.oying.modules.message.common.OrderStatusEnum;
 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.utils.FileUtil;
-import com.oying.utils.SecurityUtils;
-import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MesMsgRecordService;
-import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
 import com.oying.modules.message.mapper.MesMsgRecordMapper;
+import com.oying.modules.message.service.MesMsgRecordService;
+import com.oying.utils.FileUtil;
+import com.oying.utils.PageResult;
+import com.oying.utils.PageUtil;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
 
-import java.sql.Timestamp;
-import java.util.*;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
-
-import com.oying.utils.PageResult;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author 李萌
@@ -93,8 +94,8 @@
     }
 
     @Override
-    public List<MesMsgRecordQueryPollDto> PollMes(Long platform) {
-        return mesMsgRecordMapper.PollMes(platform);
+    public List<MesMsgRecordQueryPollDto> PollMes(Long platform, Long mestype) {
+        return mesMsgRecordMapper.PollMes(platform, mestype);
     }
 
     @Override
@@ -113,20 +114,24 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void insertOrderMsg(String orderNo, OrderStatusEnum content, Long shopId) {
         MesMsgRecord record = new MesMsgRecord();
         record.setOrderNo(orderNo);
         record.setContent(content.getValue()); // 使用枚举的描述作为消息内容
+        record.setContentKey(String.valueOf(content.getKey()));// 使用枚举的描述作为消息内容key
         record.setShopId(shopId);
         record.setMsgType(MesTypeEnum.ORDER.getKey()); // 订单消息类型为2
         record.setIsRead(MesReadEnum.UNREAD.getKey()); // 默认未读 0
         record.setCreateTime(new Timestamp(System.currentTimeMillis()));
         record.setUpdateTime(new Timestamp(System.currentTimeMillis()));
-        try {
-            mesMsgRecordMapper.insert(record);
-        } catch (Exception e) {
-          log.error("插入订单消息失败:{}", e);
-        }
+        mesMsgRecordMapper.insert(record);   // 让异常直接往外抛
 
     }
+
+
+    @Override
+    public List<MesMsgRecordQueryPollDto> PollMesAll(Long platform) {
+        return mesMsgRecordMapper.PollMesAll(platform);
+    }
 }

--
Gitblit v1.9.3