From efeda7dca7590fe54528e23cd06b0e2f63e01e22 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 21 Nov 2024 13:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=A3=9E=E8=8A=B1?=
 =?UTF-8?q?=E4=BB=A4=E6=95=B0=E9=87=8F=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/service/QuestionQa.go | 46 +++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/api/service/QuestionQa.go b/api/service/QuestionQa.go
index f85bc31..0b83b83 100644
--- a/api/service/QuestionQa.go
+++ b/api/service/QuestionQa.go
@@ -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))
 			}
 		}
 	}