增加了飞花令数量的判断
This commit is contained in:
parent
f1f04615ec
commit
efeda7dca7
@ -165,7 +165,7 @@ func (r *QuestionQaService) AddQuestionQa(req requests.AddQuestionQa) (bool, err
|
||||
// 所需飞花令数量 = 题目总数
|
||||
if tokenItemQuantity < qaQuantity {
|
||||
tx.Rollback()
|
||||
return false, errors.New("已选择飞花令的数量不满足题库使用")
|
||||
return false, errors.New("飞花令的数量需大于:" + fmt.Sprintf("%d", qaQuantity))
|
||||
}
|
||||
}
|
||||
|
||||
@ -173,22 +173,22 @@ func (r *QuestionQaService) AddQuestionQa(req requests.AddQuestionQa) (bool, err
|
||||
// 所需飞花令数量 = TokenNum
|
||||
if tokenItemQuantity < *req.TokenNum {
|
||||
tx.Rollback()
|
||||
return false, errors.New("已选择飞花令的数量不满足题库使用")
|
||||
return false, errors.New("飞花令的数量需大于:" + fmt.Sprintf("%d", *req.TokenNum))
|
||||
}
|
||||
}
|
||||
|
||||
if req.QaType == 3 {
|
||||
// 轮次 * 最大值 = 所需飞花令数量
|
||||
maxTokenQuestionQuantity := 0
|
||||
for _, content := range req.TokenQuestionContent {
|
||||
if content.Quantity > maxTokenQuestionQuantity {
|
||||
maxTokenQuestionQuantity = content.Quantity
|
||||
}
|
||||
}
|
||||
//// 轮次 * 最大值 = 所需飞花令数量
|
||||
//maxTokenQuestionQuantity := 0
|
||||
//for _, content := range req.TokenQuestionContent {
|
||||
// if content.Quantity > maxTokenQuestionQuantity {
|
||||
// maxTokenQuestionQuantity = content.Quantity
|
||||
// }
|
||||
//}
|
||||
|
||||
if tokenItemQuantity < (maxTokenQuestionQuantity * *req.RoundNum) {
|
||||
if tokenItemQuantity < *req.TokenNum {
|
||||
tx.Rollback()
|
||||
return false, errors.New("已选择飞花令的数量不满足题库使用")
|
||||
return false, errors.New("飞花令的数量需大于:" + fmt.Sprintf("%d", *req.TokenNum))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -265,7 +265,7 @@ func (r *QuestionQaService) AddQuestionQa(req requests.AddQuestionQa) (bool, err
|
||||
}
|
||||
}
|
||||
|
||||
tx.Commit()
|
||||
//tx.Commit()
|
||||
return true, nil
|
||||
}
|
||||
|
||||
@ -506,7 +506,7 @@ func (r *QuestionQaService) PutQuestionQa(qaId int64, req requests.PutQuestionQa
|
||||
// 所需飞花令数量 = 题目总数
|
||||
if tokenItemQuantity < qaQuantity {
|
||||
tx.Rollback()
|
||||
return false, errors.New("已选择飞花令的数量不满足题库使用")
|
||||
return false, errors.New("飞花令的数量需大于:" + fmt.Sprintf("%d", qaQuantity))
|
||||
}
|
||||
}
|
||||
|
||||
@ -514,22 +514,22 @@ func (r *QuestionQaService) PutQuestionQa(qaId int64, req requests.PutQuestionQa
|
||||
// 所需飞花令数量 = TokenNum
|
||||
if tokenItemQuantity < *req.TokenNum {
|
||||
tx.Rollback()
|
||||
return false, errors.New("已选择飞花令的数量不满足题库使用")
|
||||
return false, errors.New("飞花令的数量需大于:" + fmt.Sprintf("%d", *req.TokenNum))
|
||||
}
|
||||
}
|
||||
|
||||
if req.QaType == 3 {
|
||||
// 轮次 * 最大值 = 所需飞花令数量
|
||||
maxTokenQuestionQuantity := 0
|
||||
for _, content := range req.TokenQuestionContent {
|
||||
if content.Quantity > maxTokenQuestionQuantity {
|
||||
maxTokenQuestionQuantity = content.Quantity
|
||||
}
|
||||
}
|
||||
//// 轮次 * 最大值 = 所需飞花令数量
|
||||
//maxTokenQuestionQuantity := 0
|
||||
//for _, content := range req.TokenQuestionContent {
|
||||
// if content.Quantity > maxTokenQuestionQuantity {
|
||||
// maxTokenQuestionQuantity = content.Quantity
|
||||
// }
|
||||
//}
|
||||
|
||||
if tokenItemQuantity < (maxTokenQuestionQuantity * *req.RoundNum) {
|
||||
if tokenItemQuantity < *req.TokenNum {
|
||||
tx.Rollback()
|
||||
return false, errors.New("已选择飞花令的数量不满足题库使用")
|
||||
return false, errors.New("飞花令的数量需大于:" + fmt.Sprintf("%d", *req.TokenNum))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user