fix

game/qznn/wait.go

@@ -336,25 +336,25 @@ func (p *Game) WaitOpen(room Room) error {
 			var winAmount decimal.Decimal
 			userCardList := GetNNCardList(userItem.CardList)
 			masterWin, isEqual, cardLevel := WinLevel(masterCardList, userCardList)
-			if cardLevel == 0 {
-				cardLevel = 1
-			}
-
 			if !masterWin {
-				isWin = true
-
-				//赢庄家
-				winAmount = room.BaseAmount.Mul(decimal.NewFromInt(int64(masterPlayerItem.MasterMul))).Mul(decimal.NewFromInt(int64(userItem.Mul))).Mul(decimal.NewFromInt(int64(cardLevel)))
-			} else {
-				isWin = false
-
-				//输给庄家
-				winAmount = room.BaseAmount.Mul(decimal.NewFromInt(int64(masterPlayerItem.MasterMul))).Mul(decimal.NewFromInt(int64(userItem.Mul))).Mul(decimal.NewFromInt(-1)).Mul(decimal.NewFromInt(int64(cardLevel)))
+				_, _, cardLevel = WinLevel(userCardList, masterCardList)
 			}
 
 			if isEqual {
 				isWin = false
 				winAmount = decimal.NewFromInt(0)
+			} else {
+				if !masterWin {
+					isWin = true
+
+					//赢庄家
+					winAmount = room.BaseAmount.Mul(decimal.NewFromInt(int64(masterPlayerItem.MasterMul))).Mul(decimal.NewFromInt(int64(userItem.Mul))).Mul(decimal.NewFromInt(int64(cardLevel)))
+				} else {
+					isWin = false
+
+					//输给庄家
+					winAmount = room.BaseAmount.Mul(decimal.NewFromInt(int64(masterPlayerItem.MasterMul))).Mul(decimal.NewFromInt(int64(userItem.Mul))).Mul(decimal.NewFromInt(-1)).Mul(decimal.NewFromInt(int64(cardLevel)))
+				}
 			}
 
 			err = tx.Model(model.User{}).Where("id = ? and balance + ? > 0", userID, winAmount).