From 7b65fb8c1001850e468a51c2d9af474621ce7115 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 19 三月 2024 18:11:45 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index fa5e993..c2abaf0 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -230,7 +230,7 @@
                                         Map<String, String> data1 = resultUtil.getData();
                                         String s = data1.get("trade_state");
                                         String transaction_id = data1.get("transaction_id");
-                                        if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+                                        if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
                                             break;
                                         }
                                         if ("SUCCESS".equals(s)) {
@@ -244,7 +244,7 @@
                                             Integer integer = startGame(uid, gameId, spaceId, sutuId);
                                             break;
                                         }
-                                        if ("USERPAYING".equals(s)) {
+                                        if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
                                             num++;
                                         }
                                     }

--
Gitblit v1.7.1