From 982313135d1c239fe3b20e4c5664781f92d40aca Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:17:39 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/message/domain/MesMsgRecord.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 118 insertions(+), 0 deletions(-)
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
new file mode 100644
index 0000000..31436bf
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/MesMsgRecord.java
@@ -0,0 +1,118 @@
+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;
+
+/**
+* @description /
+* @author 李萌
+* @date 2025-07-25
+**/
+@Data
+@TableName("mes_msg_record")
+public class MesMsgRecord extends BaseEntity implements Serializable {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "主键")
+ private Long id;
+
+ @ApiModelProperty(value = "模板ID 可无")
+ private Integer templateId;
+
+ @NotBlank
+ @ApiModelProperty(value = "接收人ID")
+ private String receiverId;
+
+ @NotNull
+ @ApiModelProperty(value = "1=买家 2=商户 3=骑手")
+ private Integer platform;
+
+ @NotNull
+ @ApiModelProperty(value = "同模板type")
+ private Integer msgType;
+// @NotNull
+// @ApiModelProperty(value = "同模板type")
+// private MesTypeEnum msgType;
+
+
+ @NotBlank
+ @ApiModelProperty(value = "最终标题")
+ private String title;
+
+ @NotBlank
+ @ApiModelProperty(value = "最终内容")
+ private String content;
+
+ @ApiModelProperty(value = "业务ID 例如订单ID")
+ private Long bizId;
+
+ @ApiModelProperty(value = "业务类型 ORDER/EVALUATION 等")
+ private String bizType;
+
+ @NotNull
+ @ApiModelProperty(value = "已读 0=未读 1=已读")
+ private Integer isRead;
+
+ @ApiModelProperty(value = "阅读时间")
+ private Timestamp readTime;
+
+ @ApiModelProperty(value = "扩展字段 存跳转链接等")
+ private String extra;
+
+ @NotBlank
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+
+ @NotNull
+ @ApiModelProperty(value = "创建时间")
+ private Timestamp createTime;
+
+ @NotBlank
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+
+ @NotNull
+ @ApiModelProperty(value = "更新时间")
+ private Timestamp updateTime;
+ // 新增字段
+ @NotNull
+ @ApiModelProperty(value = "订单ID")
+ private Long orderId;
+
+ @NotBlank
+ @ApiModelProperty(value = "买家用户ID")
+ private String buyerId;
+
+ @NotBlank
+ @ApiModelProperty(value = "订单编号 冗余字段")
+ private String orderNo;
+
+ @NotNull
+ @ApiModelProperty(value = "店铺ID 冗余字段")
+ private Long shopId;
+
+ @NotBlank
+ @ApiModelProperty(value = "店铺名称 冗余字段")
+ private String shopName;
+
+ @ApiModelProperty(value = "骑手ID")
+ private Long riderId;
+
+ @ApiModelProperty(value = "骑手姓名 冗余字段")
+ private String riderName;
+
+ public void copy(MesMsgRecord source){
+ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ }
+}
--
Gitblit v1.9.3