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/common/MesTypeEnum.java | 9 +++++++--
oying-system/src/main/java/com/oying/modules/message/domain/MesMsgRecord.java | 32 ++++++++++++++++++--------------
oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java | 3 ++-
3 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/common/MesTypeEnum.java b/oying-system/src/main/java/com/oying/modules/message/common/MesTypeEnum.java
index fcf6782..918300a 100644
--- a/oying-system/src/main/java/com/oying/modules/message/common/MesTypeEnum.java
+++ b/oying-system/src/main/java/com/oying/modules/message/common/MesTypeEnum.java
@@ -6,16 +6,20 @@
@Getter
@AllArgsConstructor
public enum MesTypeEnum {
- //1=系统 2=订单 3=评价/留言
+ //1=系统 2=订单 3=评价/留言 4=骑手 5=商户
SYSTEM(1, "系统"),
ORDER(2, "订单"),
- COMMENT(3, "评价/留言");
+ COMMENT(3, "评价/留言"),
+ RIDER(4, "骑手"), // 补充骑手类型
+ MERCHANT(5, "商户"); // 补充商户类型
+
private final Integer key;
private final String value;
/**
* 根据key获取枚举实例
+ *
* @param key key值
* @return 对应的枚举实例，未找到返回null
*/
@@ -33,6 +37,7 @@
/**
* 根据value获取枚举实例
+ *
* @param value value值
* @return 对应的枚举实例，未找到返回null
*/
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MesMsgRecord.java b/oying-system/src/main/java/com/oying/modules/message/domain/MesMsgRecord.java
index 31436bf..387199b 100644
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MesMsgRecord.java
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/MesMsgRecord.java
@@ -1,24 +1,24 @@
package com.oying.modules.message.domain;
-import com.oying.base.BaseEntity;
-import com.oying.modules.message.common.MesTypeEnum;
-import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
-import java.sql.Timestamp;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.oying.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.sql.Timestamp;
/**
-* @description /
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @description /
+ * @date 2025-07-25
+ **/
@Data
@TableName("mes_msg_record")
public class MesMsgRecord extends BaseEntity implements Serializable {
@@ -53,6 +53,10 @@
@NotBlank
@ApiModelProperty(value = "最终内容")
private String content;
+
+ @NotBlank
+ @ApiModelProperty(value = "最终内容key")
+ private String contentKey;
@ApiModelProperty(value = "业务ID 例如订单ID")
private Long bizId;
@@ -112,7 +116,7 @@
@ApiModelProperty(value = "骑手姓名 冗余字段")
private String riderName;
- public void copy(MesMsgRecord source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ public void copy(MesMsgRecord source) {
+ BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
}
}
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 165b41c..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
@@ -119,13 +119,14 @@
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()));
mesMsgRecordMapper.insert(record); // 让异常直接往外抛
-
+
}
--
Gitblit v1.9.3