From 3c433d5045813bd41d407b34a381cf100465621f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 十一月 2024 18:57:31 +0800
Subject: [PATCH] 10310 【后台】优化游戏分支获取数据的功能

---
 center/appversion_new.php |   63 +++++++++++++++----------------
 1 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/center/appversion_new.php b/center/appversion_new.php
index d8cb83e..4a7db1f 100644
--- a/center/appversion_new.php
+++ b/center/appversion_new.php
@@ -23,44 +23,43 @@
 	exit;
 }
 
-// 鍒嗘敮淇℃伅
-if (\DBOper\FindOne("GamePackBranch", array("Channel" => $channel, "BranchNum" => $branch), $branchData)) {
+// 鐗堟湰寮烘洿淇℃伅
+$VersionCount = 0; //寮烘洿
+$downUrl = "";
+$VersionState = 0;
+// 浼樺厛璇绘寚瀹氱増鏈俊鎭�
+if (\DBOper\FindOne("GameVersion", array("Channel" => $channel, "BranchNum" => $branch, "Version" => $versioncode), $versionInfo)) {
+	$VersionState = $versionInfo["VersionState"] ? intval($versionInfo["VersionState"]) : 0;
+	$curVersionNum = \CommFunc\VersionNum($versioncode);
+	$versionNum = \CommFunc\VersionNum($versionInfo["Version"]);
+	// \Logging\LogInfo("versionInfo: " . print_r($versionInfo, true));
+	if ($curVersionNum < $versionNum) {
+		if ($versionInfo["ForceDownUrl"]) {
+			$VersionCount = 1;
+			$downUrl = $versionInfo["ForceDownUrl"];
+		}
+		continue;
+	}
+}
+$retVersion["VersionCount"] = $VersionCount;
+$retVersion["downUrl"] = $downUrl;
+
+// 鐗堟湰鐘舵��
+if ($VersionState > 0 && \DBOper\FindOne("GameVersionState", array("Channel" => $channel, "BranchNum" => $branch, "VersionState" => $VersionState), $stateInfo)) {
+	// 淇濈暀鍓嶇json鏍煎紡锛屼絾鍙笅鍙戞湰鍒嗘敮鐨勬暟鎹�
+	$retVersion["notice_flag"] = array("" . $branch => $stateInfo["NoticeUrl"]);
+	$retVersion["resource_url"] = array("" . $branch => $stateInfo["ResourceUrl"]);
+	$retVersion["ResourceAward"] = $stateInfo["ResourceAwardInfo"];
+	$retVersion["AuditState"] = 0;
+}
+// 娌℃湁鎸囧畾鐗堟湰锛岄粯璁ゅ彇鍒嗘敮淇℃伅
+else if (\DBOper\FindOne("GamePackBranch", array("Channel" => $channel, "BranchNum" => $branch), $branchData)) {
 	// 淇濈暀鍓嶇json鏍煎紡锛屼絾鍙笅鍙戞湰鍒嗘敮鐨勬暟鎹�
 	$retVersion["notice_flag"] = array("" . $branch => $branchData["NoticeUrl"]);
 	$retVersion["resource_url"] = array("" . $branch => $branchData["ResourceUrl"]);
 	$retVersion["ResourceAward"] = $branchData["ResourceAwardInfo"];
 	$retVersion["AuditState"] = intval($branchData["AuditState"]);
-	// $retVersion["ResourceAward"] = array(
-	// 	"version" => $branchData["ResourceAwardVer"],
-	// 	"awardItemList" => $branchData["ResourceAwardInfo"],
-	// );
 }
-
-// 鐗堟湰寮烘洿淇℃伅
-$VersionCount = 0; //寮烘洿
-$downUrl = "";
-
-if (\DBOper\Find(
-	"GameVersion",
-	array("Channel" => $channel, "BranchNum" => $branch),
-	$versionDatas
-) && isset($versionDatas)) {
-	$curVersionNum = \CommFunc\VersionNum($versioncode);
-	foreach ($versionDatas as $versionInfo) {
-		$versionNum = \CommFunc\VersionNum($versionInfo["Version"]);
-		// \Logging\LogInfo("versionInfo: " . print_r($versionInfo, true));
-		if ($curVersionNum < $versionNum) {
-			if ($versionInfo["ForceDownUrl"]) {
-				$VersionCount = 1;
-				$downUrl = $versionInfo["ForceDownUrl"];
-			}
-			continue;
-		}
-	}
-}
-
-$retVersion["VersionCount"] = $VersionCount;
-$retVersion["downUrl"] = $downUrl;
 
 // \Logging\LogInfo("_GET: " . print_r($_GET, true) . " retVersion: " . print_r($retVersion, true));
 echo \CommFunc\MyJson_encode($retVersion);

--
Gitblit v1.8.0