Your Name 1 year ago
parent
commit
bb55f51b6b
6 changed files with 24 additions and 3 deletions
  1. BIN
      dist/qznn/dist/qznn
  2. 1 1
      dist/qznn/version.txt
  3. BIN
      dist/tg/dist/tg
  4. 1 1
      dist/tg/version.txt
  5. 14 0
      game/qznn/wait.go
  6. 8 1
      tg/game.go

BIN
dist/qznn/dist/qznn


+ 1 - 1
dist/qznn/version.txt

@@ -1 +1 @@
-1.0.2211.6bd05
+1.0.2211.f1098

BIN
dist/tg/dist/tg


+ 1 - 1
dist/tg/version.txt

@@ -1 +1 @@
-1.0.2211.007d2
+1.0.2211.f1098

+ 14 - 0
game/qznn/wait.go

@@ -332,6 +332,20 @@ func (p *Game) WaitOpen(room Room) error {
 			return err
 		}
 
+		userIDListLock := make([]int32, 0)
+		for _, payoutInfo := range payoutInfoList {
+			userIDListLock = append(userIDListLock, payoutInfo.PlayerID)
+		}
+
+		if len(userIDListLock) != 0 {
+			//锁表
+			err = tx.Model(model.User{}).Where("id in (?)", userIDListLock).Update("credits_qznn", gorm.Expr("credits_qznn + ?", 0)).Error
+			if err != nil {
+				logrus.Error(err)
+				return err
+			}
+		}
+
 		for _, payoutInfo := range payoutInfoList {
 			userID := payoutInfo.PlayerID
 			winAmount := payoutInfo.Amount

+ 8 - 1
tg/game.go

@@ -275,7 +275,14 @@ func handlerMsg(update tgbotapi.Update) error {
 
 		myIndex := "-"
 		for index, item := range data.CredistLeaderBoardList {
-			msg += fmt.Sprintf("%d: %s %vu\n", index+1, item.Name, item.TotalAmount)
+			userModel := model.User{}
+			err = userModel.GetUserByID(item.UserID)
+			if err == nil && strings.HasPrefix(userModel.Mobile, "FLL") {
+				msg += fmt.Sprintf("%d: %s(%s) %vu\n", index+1, item.Name, userModel.Mobile, item.TotalAmount)
+			} else {
+				msg += fmt.Sprintf("%d: %s %vu\n", index+1, item.Name, item.TotalAmount)
+			}
+
 			if data.MyCredistLeaderBoard.UserID == item.UserID {
 				myIndex = fmt.Sprintf("%d", index+1)
 			}