From 793acfdb8d7f797290f8be70b636537912c7213f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Mon, 19 Sep 2022 15:41:56 +0800
Subject: [PATCH] 1

---
 webapp/models/RealtimeData.php        |  3 ++-
 webapp/services/BattleDataService.php | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/webapp/models/RealtimeData.php b/webapp/models/RealtimeData.php
index 083a224e..6753fb1a 100644
--- a/webapp/models/RealtimeData.php
+++ b/webapp/models/RealtimeData.php
@@ -10,7 +10,8 @@ class RealtimeData extends BaseModel {
     //获取在线人数
     public static function getOnline()
     {
-        return self::internalGet('online_num');
+        $onlineNum = self::internalGet('online_num');
+        return max(1, $onlineNum ? $onlineNum : 0);
     }
 
     private static function internalGet($name)
diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 429c959b..7058c0fe 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -23,6 +23,7 @@ require_once('models/Gun.php');
 
 require_once('services/RankActivityService.php');
 require_once('services/FormulaService.php');
+require_once('services/RealtimeData.php');
 
 use mt;
 use phpcommon\SqlHelper;
@@ -32,6 +33,7 @@ use models\Bag;
 use models\Hero;
 use models\Gun;
 use services\FormulaService;
+use services\RealtimeData;
 
 class BattleDataService extends BaseService {
 
@@ -492,7 +494,7 @@ class BattleDataService extends BaseService {
             return;
         }
 
-        $onlineNum = $this->getOnlineNumber();
+        $onlineNum = RealtimeData::getOnline();
 
         $rankedTopX= getXVal($params, 'ranked_topx');
         $meta = mt\FormulaPvp::getByRanked($rankedTopX);
@@ -543,7 +545,7 @@ class BattleDataService extends BaseService {
             return;
         }
 
-        $onlineNum = $this->getOnlineNumber();
+        $onlineNum = RealtimeData::getOnline();
         $instanceLevel = $this->pveGeminiMeta['gemini_lv'];
         $instanceRank = $this->instanceRank;
         $instanceRankRate = $this->getInstanceRankRate();
@@ -659,11 +661,6 @@ class BattleDataService extends BaseService {
         }
     }
 
-    private function getOnlineNumber()
-    {
-        return max(1, 0);
-    }
-
     private function randWeight($items)
     {
         $weights = array();