From 8849a8a7032079df128f0c530fd4368cfbc75d81 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:10:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/message/domain/MesMsgRecord.java | 62 ++++++++++--------------------
1 files changed, 21 insertions(+), 41 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
index 31436bf..c5075c4 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 {
@@ -30,15 +30,12 @@
@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
@@ -46,13 +43,14 @@
// private MesTypeEnum msgType;
- @NotBlank
@ApiModelProperty(value = "最终标题")
private String title;
- @NotBlank
@ApiModelProperty(value = "最终内容")
private String content;
+
+ @ApiModelProperty(value = "最终内容key")
+ private String contentKey;
@ApiModelProperty(value = "业务ID 例如订单ID")
private Long bizId;
@@ -60,7 +58,6 @@
@ApiModelProperty(value = "业务类型 ORDER/EVALUATION 等")
private String bizType;
- @NotNull
@ApiModelProperty(value = "已读 0=未读 1=已读")
private Integer isRead;
@@ -70,49 +67,32 @@
@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 buyerName;
+
@ApiModelProperty(value = "订单编号 冗余字段")
private String orderNo;
- @NotNull
@ApiModelProperty(value = "店铺ID 冗余字段")
private Long shopId;
- @NotBlank
@ApiModelProperty(value = "店铺名称 冗余字段")
private String shopName;
@ApiModelProperty(value = "骑手ID")
- private Long riderId;
+ private String riderId;
@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));
}
}
--
Gitblit v1.9.3