From 820d8de1d526557d4ecd8d3aa5622dbdf43e8544 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Tue, 29 Jul 2025 09:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=A2=98=E5=BA=93?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E9=87=8D=E5=A4=8D=E7=9A=84=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=911?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/dto/QuestionQa.go | 3 +++ api/model/QuestionQa.go | 1 + api/service/QuestionQa.go | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/api/dto/QuestionQa.go b/api/dto/QuestionQa.go index 2638269..606a661 100644 --- a/api/dto/QuestionQa.go +++ b/api/dto/QuestionQa.go @@ -19,6 +19,7 @@ type QuestionQaDto struct { QaRuleContent string `json:"qa_rule_content"` // 规则解释 QaDisplayType int `json:"qa_display_type"` // 展示类型(1:常规 2:飞花令) IsTurnTimer int `json:"is_turn_timer"` // 是否开启计时(0:否 1:是) + IsRepeat int `json:"is_repeat"` // 是否允许重复(0:否 1:是) QaExpireTime *model.LocalTime `json:"qa_expire_time"` // 过期时间 QaShareId string `json:"qa_share_id"` // 分享标识 QaPassword string `json:"qa_password"` // 分享密码 @@ -68,6 +69,7 @@ func GetQuestionQaListDto(m []*model.QuestionQa) []*QuestionQaDto { QaRuleContent: v.QaRuleContent, QaDisplayType: v.QaDisplayType, IsTurnTimer: v.IsTurnTimer, + IsRepeat: v.IsRepeat, QaExpireTime: &v.QaExpireTime, QaShareId: utils.AddDomain(v.QaShareId), QaPassword: v.QaPassword, @@ -106,6 +108,7 @@ func GetQuestionQaDto(m *model.QuestionQa) *QuestionQaDto { QaRuleContent: m.QaRuleContent, QaDisplayType: m.QaDisplayType, IsTurnTimer: m.IsTurnTimer, + IsRepeat: m.IsRepeat, QaExpireTime: &m.QaExpireTime, QaShareId: utils.AddDomain(m.QaShareId), QaPassword: m.QaPassword, diff --git a/api/model/QuestionQa.go b/api/model/QuestionQa.go index 42281ca..783c8f1 100644 --- a/api/model/QuestionQa.go +++ b/api/model/QuestionQa.go @@ -18,6 +18,7 @@ type QuestionQa struct { QaRuleContent string `gorm:"column:qa_rule_content;type:text;comment:规则解释" json:"qa_rule_content"` QaDisplayType int `gorm:"column:qa_display_type;type:tinyint(1);default:1;comment:展示类型(1:常规 2:飞花令)" json:"qa_display_type"` IsTurnTimer int `gorm:"column:is_turn_timer;type:tinyint(1);default:0;comment:是否开启计时(0:否 1:是)" json:"is_turn_timer"` + IsRepeat int `gorm:"column:;type:tinyint(1);default:0;comment:是否允许重复(0:否 1:是)" json:""` QaExpireTime LocalTime `gorm:"column:qa_expire_time;type:datetime;comment:过期时间" json:"qa_expire_time"` QaShareId string `gorm:"column:qa_share_id;type:varchar(255);comment:分享标识" json:"qa_share_id"` QaPassword string `gorm:"column:qa_password;type:varchar(255);comment:分享密码" json:"qa_password"` diff --git a/api/service/QuestionQa.go b/api/service/QuestionQa.go index 2fbe407..0ae845a 100644 --- a/api/service/QuestionQa.go +++ b/api/service/QuestionQa.go @@ -90,6 +90,7 @@ func (r *QuestionQaService) AddQuestionQa(req requests.AddQuestionQa) (bool, err RoundNum: nil, QaDisplayType: req.QaDisplayType, IsTurnTimer: req.IsTurnTimer, + IsRepeat: req.IsRepeat, QaExpireTime: model.LocalTime(qaExpireTime), QaPassword: req.QaPassword, OpenNumber: 0, @@ -359,6 +360,11 @@ func (r *QuestionQaService) PutQuestionQa(qaId int64, req requests.PutQuestionQa questionQaData["qa_password"] = req.QaPassword } + // 是否允许重复 + if req.IsRepeat != questionQa.IsRepeat { + questionQaData["is_repeat"] = req.IsRepeat + } + // 背景图 image := utils.RemoveOssDomain(req.Image) if image != questionQa.Image {