vali 6 tahun lalu
induk
melakukan
ec3b58136e
1 mengubah file dengan 9 tambahan dan 4 penghapusan
  1. 9 4
      app/Logic/DataLogic.php

+ 9 - 4
app/Logic/DataLogic.php

@@ -301,7 +301,8 @@ class DataLogic
             $match_uuids = array_unique($match_uuids);
             sort($match_uuids);
 
-            $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->where('source', $source)->select('match_id', 'identity')->get()->toArray();
+            //$l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->where('source', $source)->select('match_id', 'identity')->get()->toArray();
+            $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->select('match_id', 'identity')->get()->toArray();
 
             //二维数组去重
             $l_match_data = commonFunction::uniquArrV2($l_match_data, 'identity');
@@ -538,7 +539,9 @@ class DataLogic
             sort($match_uuids);
 
             //获取 本地 已存在 赛事
-            $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->where('source', $source)->select('identity', 'match_id')->get()->toArray();
+            // $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->where('source', $source)->select('identity', 'match_id')->get()->toArray();
+            $l_match_data = $models['model_local_match']::whereIn('identity', $match_uuids)->select('identity', 'match_id')->get()->toArray();
+
             //二维数组去重
             $l_match_data = commonFunction::uniquArrV2($l_match_data, 'identity');
 
@@ -1459,7 +1462,8 @@ class DataLogic
 
             //获取赛事 match_id
             $match_id = $models['model_local_match']::SELECT('others_match_id', 'match_id')
-                ->where(['source' => $source, 'identity' => $match_identity])
+                //->where(['source' => $source, 'identity' => $match_identity])
+                ->where(['identity' => $match_identity])
                 ->first()->match_id;
 
             if (!empty($match_id)) {
@@ -1543,7 +1547,8 @@ class DataLogic
     public function matchVerify_v2($models = [], $match_identity = '', $source = '', $gameName = '')
     {
         if (empty($models) || empty($match_identity)) throw new \Exception(Response::generate('', Response::ABNORMAL));
-        $l_match_id = $models['model_local_match']::where(['identity' => $match_identity, 'source' => $source])->value('match_id');
+        //$l_match_id = $models['model_local_match']::where(['identity' => $match_identity, 'source' => $source])->value('match_id');
+        $l_match_id = $models['model_local_match']::where(['identity' => $match_identity])->value('match_id');
 
         if ($l_match_id < 1) throw new \Exception(Response::generate($gameName . 'match_identity-' . $match_identity, Response::MATCH_ERROR));
         return $l_match_id;