From d024d8bd7dfecda8bccdc1632873d7344b14fa1d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 5 Aug 2024 19:34:28 +0800
Subject: [PATCH] 1

---
 server/adminserver/api/v1/system/mail.go | 7 ++++++-
 server/adminserver/model/system/mail.go  | 2 ++
 server/jccommon/constant.go              | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/adminserver/api/v1/system/mail.go b/server/adminserver/api/v1/system/mail.go
index a0f87220..d4c16d76 100644
--- a/server/adminserver/api/v1/system/mail.go
+++ b/server/adminserver/api/v1/system/mail.go
@@ -26,6 +26,7 @@ func (this *MailApi) ListMail(c *gin.Context) {
 
 func (this *MailApi) AddMail(c *gin.Context) {
 	reqJson := struct {
+		UniKey           string              `json:"unikey"`
 		MailType         int32               `binding:"required" json:"mailtype"`
 		SendTime         int32               `json:"sendtime"`
 		ExpireTime       int32               `json:"expiretime"`
@@ -62,9 +63,13 @@ func (this *MailApi) AddMail(c *gin.Context) {
 	mail.Content = reqJson.Content
 	mail.Attachments = reqJson.Attachments
 	mail.Recipients = reqJson.Recipients
+	mail.Tag1 = jccommon.MAIL_TAG1_CUSTOM
+	mail.Tag2 = jccommon.MAIL_TAG2_CUSTOM_NORMAL
 	mail.CreateTime = nowDaySeconds
 	mail.ModifyTime = nowDaySeconds
-	f5.GetApp().GetOrmDb(constant.MAIL_DB).Create(mail)
+	if f5.GetApp().GetOrmDb(constant.MAIL_DB).Create(mail).Error == nil {
+
+	}
 	{
 		e := new(jccommon.MailEvent)
 		e.EventName = jccommon.EVENT_MAIL_UPDATE
diff --git a/server/adminserver/model/system/mail.go b/server/adminserver/model/system/mail.go
index d192ef7a..e9911256 100644
--- a/server/adminserver/model/system/mail.go
+++ b/server/adminserver/model/system/mail.go
@@ -33,6 +33,8 @@ type Mail struct {
 	SendTime int32 `gorm:"column:sendtime" json:"sendtime"`
 	UserRegStartTime int32 `gorm:"column:user_reg_start_time" json:"user_reg_start_time"`
 	UserRegEndTime int32 `gorm:"column:user_reg_end_time" json:"user_reg_end_time"`
+	Tag1 int32 `gorm:"column:tag1" json:"tag1"`
+	Tag2 int32 `gorm:"column:tag2;<-:create" json:"tag2"`
 	ExpireTime int32 `gorm:"column:expiretime" json:"expiretime"`
 	CreateTime int32 `gorm:"column:createtime;<-:create" json:"createtime"`
 	ModifyTime int32 `gorm:"column:modifytime" json:"modifytime"`
diff --git a/server/jccommon/constant.go b/server/jccommon/constant.go
index 74c12488..948730ab 100644
--- a/server/jccommon/constant.go
+++ b/server/jccommon/constant.go
@@ -37,11 +37,14 @@ const (
 )
 
 const (
+	MAIL_TAG1_CUSTOM = 1
 	MAIL_TAG1_HERO = 100
 	MAIL_TAG1_GOLD_BULLION = 101
 )
 
 const (
+	MAIL_TAG2_CUSTOM_NORMAL = 1
+
 	MAIL_TAG2_HERO_MINT = 1
 	MAIL_TAG2_HERO_LOCK = 2
 	MAIL_TAG2_HERO_UNLOCK = 3