server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
yangduo 2024-08-16 11:52:34 +08:00
parent e771ff72ce
commit 7795b8872b
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server/adminserver/api/v1/system/mail.go
View File

@ -139,7 +139,11 @@ func (this *MailApi) AddMail(c *gin.Context) {
return
}
if reqJson.MailType == jccommon.MAIL_TYPE_GROUP && !this.CheckRecipients(&reqJson.Recipients, c) {
if reqJson.MailType == jccommon.MAIL_TYPE_ALL {
if len(reqJson.Recipients) > 0 {
return
}
} else if reqJson.MailType == jccommon.MAIL_TYPE_GROUP && !this.CheckRecipients(&reqJson.Recipients, c) {
return
}
@ -215,25 +219,21 @@ func (this *MailApi) EditMail(c *gin.Context) {
})
return
}
if reqJson.MailType <= jccommon.MAIL_TYPE_BEGIN || reqJson.MailType >= jccommon.MAIL_TYPE_END {
c.JSON(http.StatusOK, gin.H{
"code": 2,
"message": "mail_type参数错误",
})
return
}
if !this.CheckAttachment(reqJson.Attachments, c) {
return
}
if reqJson.MailType == jccommon.MAIL_TYPE_GROUP && !this.CheckRecipients(&reqJson.Recipients, c) {
return
}
// if reqJson.MailType <= jccommon.MAIL_TYPE_BEGIN || reqJson.MailType >= jccommon.MAIL_TYPE_END {
// c.JSON(http.StatusOK, gin.H{
// "code": 2,
// "message": "mail_type参数错误",
// })
// return
// }
var count int64 = 0
mail := new(system.Mail)
if f5.GetApp().GetOrmDb(constant.MAIL_DB).Table("t_mail").Take(mail, "mail_id = ?", reqJson.MailId).Count(&count); count < 1 {
if f5.GetApp().GetOrmDb(constant.MAIL_DB).Table(mail.TableName()).Take(mail, "mail_id = ?", reqJson.MailId).Count(&count); count < 1 {
c.JSON(http.StatusOK, gin.H{
"code": 2,
"message": "mailid不存在",
@ -241,9 +241,17 @@ func (this *MailApi) EditMail(c *gin.Context) {
return
}
if mail.MailType == jccommon.MAIL_TYPE_ALL {
if len(reqJson.Recipients) > 0 {
return
}
} else if mail.MailType == jccommon.MAIL_TYPE_GROUP && !this.CheckRecipients(&reqJson.Recipients, c) {
return
}
nowDaySeconds := int32(f5.GetApp().GetRealSeconds())
mail.MailId = reqJson.MailId
mail.MailType = reqJson.MailType
// mail.MailType = reqJson.MailType
mail.SendTime = reqJson.SendTime
mail.ExpireTime = reqJson.ExpireTime
mail.UserRegStartTime = reqJson.UserRegStartTime