追加推送 解决线上无法登陆注册 5/20

Application/Sports/Controller/WriteSports.php

@@ -89,24 +89,48 @@ class WriteSports extends Controller{
         $set_lg['area_id'] = $belong['area_id'];
         $set_lg['country_id'] = $belong['country_id'];
 
-        //查询是否 已存在
-        $post = lm($model['model_league'],'Sports')
-            ->select('id as m_lg_id')
-            ->where('name_chinese','=',$data['name_chinese'])
-            ->first();
+        //查询中间表 是否已记录
+        $m_lg_id = lm($model['model_local_league'],'Sports')
+            ->select('m_lg_id')
+            ->where(['lg_id'=>$data['lg_id'],'source'=>$data['source']])
+            ->first()->m_lg_id;
 
-        $m_lg_id = $post->m_lg_id;
-        //如果不存在，则写入联赛表
+//        $m_lg_id = $post->m_lg_id;
+        //如果没有记录
         if(empty($m_lg_id)){
-            $set_lg['name_chinese'] = $data['name_chinese'];
-            $set_lg['kind'] = $data['kind'];
-            $set_lg['match_mode'] = $data['match_mode'];
-            $set_lg['if_stop'] = $data['if_stop'];
-            $set_lg['last_time'] = $data['last_time'];
+            //查询联赛是否已存在
+            $id = lm($model['model_league'],'Sports')
+                ->select('id')
+                ->where('name_chinese','=',$data['name_chinese'])
+                ->first()->id;
+            if(empty($id)){
+                $set_lg['name_chinese'] = $data['name_chinese'];
+                $set_lg['kind'] = $data['kind'];
+                $set_lg['match_mode'] = $data['match_mode'];
+                $set_lg['if_stop'] = $data['if_stop'];
+                $set_lg['last_time'] = $data['last_time'];
 
-            $ret = lm($model['model_league'],'Sports')->insertGetId($set_lg);
-            $m_lg_id = $ret;
-            if($m_lg_id < 1) Render([], '10012', lang('Tips','Sports')->get('insert_error'));
+                $id = lm($model['model_league'],'Sports')->insertGetId($set_lg);
+                $m_lg_id = $id;
+                if($m_lg_id < 1) Render([], '10012', lang('Tips','Sports')->get('insert_error'));
+            }
+            $set_local = [
+                'm_lg_id'=>$id,
+                'lg_id'=>$data['lg_id'],
+                'source'=>$data['source'],
+            ];
+            $ret = lm($model['model_local_league'],'Sports')-> insertGetId($set_local);
+            if($ret < 1) Render([], '10017', lang('Tips','Sports')->get('local_league_error'));
+
+//            $set_lg['name_chinese'] = $data['name_chinese'];
+//            $set_lg['kind'] = $data['kind'];
+//            $set_lg['match_mode'] = $data['match_mode'];
+//            $set_lg['if_stop'] = $data['if_stop'];
+//            $set_lg['last_time'] = $data['last_time'];
+//
+//            $ret = lm($model['model_league'],'Sports')->insertGetId($set_lg);
+//            $m_lg_id = $ret;
+//            if($m_lg_id < 1) Render([], '10012', lang('Tips','Sports')->get('insert_error'));
         }
 
         //查询关联表是否 记录
@@ -165,13 +189,49 @@ class WriteSports extends Controller{
         Render([], '1', lang('Tips','Sports')->get('success'));
     }
 
-
     //写入赛事数据
     public function competition($opt = []){
         $game_code = $opt['game_code'];
         //根据球类代码获取相关model
         $model = $this->commonFunction->getModels($game_code,1);
         $data = $opt['data'];
+
+        if(empty($data['lg_id'])) Render([], '10015', lang('Tips','Sports')->get('league_error'));
+
+        //验证赛事所属联赛
+        if(!empty($data['lg_id'])){
+            $lg = lm($model['model_local_league'],'Sports')
+                ->select('m_lg_id')
+                ->where(['lg_id'=>$data['lg_id'],'source'=>$data['source']])
+                ->first()->m_lg_id;
+            if(empty($lg)) Render([], '10015', lang('Tips','Sports')->get('league_error'));
+        }
+
+        $match_id = lm($model['model_local_match'],'Sports')
+            ->select('m_match_id')
+            ->where(['match_id'=>$data['match_id'],'source'=>$data['source']])
+            ->first()->m_match_id;
+        dd($match_id);
+        //更新操作
+        if(!empty($match_id)){
+            $ret = lm($model['model_match'],'Sports')
+                -> where(['match_id'=>$data['match_id']])
+                -> update($data);
+            if($ret < 1) Render([], '10011', lang('Tips','Sports')->get('update_error'));
+        }else{
+            //写入操作
+            $ret = lm($model['model_match'],'Sports')->insert($data);
+            if($ret != true) Render([], '10012', lang('Tips','Sports')->get('insert_error'));
+        }
+        Render([], '1', lang('Tips','Sports')->get('success'));
+    }
+
+    //写入赛事数据  弃用
+    public function __competition($opt = []){
+        $game_code = $opt['game_code'];
+        //根据球类代码获取相关model
+        $model = $this->commonFunction->getModels($game_code,1);
+        $data = $opt['data'];
 //        foreach ($opt['data'] as $k => $v){
             //验证赛事所属联赛
             if(!empty($data['lg_id'])){

Application/Sports/Model/Setinfo.php

@@ -0,0 +1,15 @@
+<?php
+namespace App\Sports\Model;
+
+use \System\Model;
+
+/**
+ * Class Account
+ * @package App\Sports\Model
+ * 设置数据源
+ */
+class Setinfo extends Model
+{
+
+    protected $table = 'setinfo';
+}

Biz/Common/CommonFunction.php

@@ -697,15 +697,15 @@ class CommonFunction {
 
 
         $data = [
-            'model_league'=>$model_league,
-            'model_match'=>$model_match,
-            'model_odds'=>$model_odds,
-            'model_result' =>$model_result,
-            'model_odds_record' => $model_odds_record,
-            'model_result_record' =>$model_result_record,
-            'model_league_result'=>$model_league_result,
-            'model_local_league'=>$model_local_league,
-            'model_local_match'=>$model_local_match,
+            'model_league'=>$model_league,//联赛
+            'model_match'=>$model_match,//赛事
+            'model_odds'=>$model_odds,//赔率
+            'model_result' =>$model_result,//赛事结果
+            'model_odds_record' => $model_odds_record,//赔率记录
+            'model_result_record' =>$model_result_record,//赛事结果记录
+            'model_league_result'=>$model_league_result,//联赛结果
+            'model_local_league'=>$model_local_league,//本地关联联赛
+            'model_local_match'=>$model_local_match,//本地关联赛事
         ];
         return $data;
     }

Library/Common/Controller.php

@@ -21,7 +21,14 @@ class Controller {
 		
 		global $logger;
 		$this->logger = $logger;
-		$this->source = require "Config/ControlData.php";
+		//获取当前数据源
+//        $source = lm('setinfo','Sports')->where('infoname','体育比分数据源设置')->value('infocontent');
+//
+//        $this->source = [
+//          'source' => $source
+//        ];
+        $this->source = require "Config/ControlData.php";
+
 		if (method_exists($this, 'beforeInit')) {
 			$this->beforeInit();
 		}