Merge branch 'master'

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -164,7 +164,7 @@ class SoccerNoteListController extends Controller
     }
 
     /**
-     *单式注单结算
+     *单式注单首次结算
      */
     public function settlement(Req $req)
     {
@@ -174,10 +174,17 @@ class SoccerNoteListController extends Controller
         }
         $order = \App\Models\SportsNoteList::where('id', $id)->first();
         $order_ids = array($order->order_id);
-        //return $order_ids;
+        $match_id = $order->match_id;
+        $game_code = $order->game_code;
+        //return $match_id;
+        //判断输赢
+        $comendnotice = new \App\Models\Comendnotice();
+        $res = $comendnotice->addcomendnotice($match_id);
+        //结算
         $SettlementOrder = new SettlementOrder();
         $bet_type = 1;//单式注单
-        $data = $SettlementOrder->reSettlement($order_ids, $bet_type);
+        $settype = 1; //首次结算
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
         return $data;
     }
 
@@ -191,11 +198,18 @@ class SoccerNoteListController extends Controller
             return -1;
         }
         $order = \App\Models\SportsNoteList::where('id',$id)->first();
+        $match_id = $order->match_id;
+        $game_code = $order->game_code;
         $order_ids = array($order->order_id);
-        //return $order_ids;
+        //return $match_id;
+        //重新判断输赢
+        $comendnotice = new \App\Models\Comendnotice();
+        $res = $comendnotice->addcomendnotice($match_id);
+        //结算
         $SettlementOrder = new SettlementOrder();
         $bet_type = 1;//单式注单
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type);
+        $settype = 2; //重新结算
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
         return $data;
     }
 

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -35,7 +35,7 @@ class SoccerStringNoteListController extends Controller
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('order_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
-        $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('detail_content', array('sort' => false, 'width' => 150));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
         $dt->addColsFields('water_return', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
@@ -44,7 +44,7 @@ class SoccerStringNoteListController extends Controller
         $dt->addColsFields('money_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('order_status', array('sort' => false, 'width' => 90));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 230));
-        $dt->addColsFields('settle_status', array('sort' => false, 'width' => 80));
+        $dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));
 //        if (checkRriv('/admin/SoccerStringNoteList/edit')) {
 //            $arr[] ='edit';
 //        }
@@ -197,12 +197,22 @@ class SoccerStringNoteListController extends Controller
             return -1;
         }
         $order = \App\Models\MoneyBuyStr::where('id', $id)->first();
+        $match = \App\Models\MoneyBuyMatch::where('batch_id',$order->batch_id)->where('bet_type','2')->get();
+        for($i=0;$i<count($match);$i++){
+            $match_id = $match[$i]->match_id;
+            $game_code = $match[$i]->game_code;
+            //判断输赢
+            //$match_ids[] = $match[$i]->match_id;
+            $comendnotice = new \App\Models\Comendnotice();
+            $res[] = $comendnotice->addcomendnotice($match_id);
+        }
         $order_ids = array($order->order_id);
-        //return $order_ids;
+        //return $match_ids;
+        //结算
         $SettlementOrder = new SettlementOrder();
         $bet_type = 2; //串关注单
-        $data = $SettlementOrder->reSettlement($order_ids, $bet_type);
-        //dd($SettlementOrder);
+        $settype = 1; //首次结算
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
         return $data;
     }
 
@@ -215,11 +225,21 @@ class SoccerStringNoteListController extends Controller
             return -1;
         }
         $order = \App\Models\MoneyBuyStr::where('id',$id)->first();
+        $match = \App\Models\MoneyBuyMatch::where('batch_id',$order->batch_id)->where('bet_type','2')->get();
+        for($i=0;$i<count($match);$i++){
+            $match_id = $match[$i]->match_id;
+            $game_code = $match[$i]->game_code;
+            //判断输赢
+            $comendnotice = new \App\Models\Comendnotice();
+            $res = $comendnotice->addcomendnotice($match_id);
+        }
         $order_ids = array($order->order_id);
         //return $order_ids;
+        //重新结算
         $SettlementOrder = new SettlementOrder();
         $bet_type = 2; //串关注单
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type);
+        $settype = 2; //重新结算
+        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id);
         return  $data;
     }
 

app/Http/Controllers/Api/WriteSportsController.php

@@ -180,8 +180,8 @@ class WriteSportsController extends BaseController{
 		    "shower" => $data['shower'],
 		    "showid" => (int)$data['showid'],
             "start_time" => $data['start_time'],
-            "ctime" =>date('Y-m-d H:m:i'),
-            "utime" =>date('Y-m-d H:m:i'),
+            "ctime" =>date('Y-m-d H:i:s'),
+            "utime" =>date('Y-m-d H:i:s'),
         ];
         $ret = broadcastModel::insert($set_broadcast);
         if($ret == false) throw new \Exception(Response::generate('',Response::BROADCAST_ERROR));
@@ -239,7 +239,7 @@ class WriteSportsController extends BaseController{
             $set_lg['match_mode'] = $data['match_mode'];
             $set_lg['if_stop'] = $data['if_stop'];
             $set_lg['last_time'] = $last_time;
-            $set_lg['utime'] = date('Y-m-d H:m:i');
+            $set_lg['utime'] = date('Y-m-d H:i:s');
             if(empty($id)){
                 //写入联赛
                 $id = $model['model_league']::insertGetId($set_lg);
@@ -298,18 +298,18 @@ class WriteSportsController extends BaseController{
                 //给冠军盘口赛事 赋值时间
                 $time = strtotime($last_time);
                 $data['match_date'] = date('Y-m-d',$time);
-                $data['match_time'] = date('H:m:i',$time);
+                $data['match_time'] = date('H:i:s',$time);
             }
             $set_match = [
-                'ctime'=>date('Y-m-d H:m:i'),
-                'utime'=>date('Y-m-d H:m:i'),
-                'expire_time'=>date('Y-m-d H:m:i',time()+60),
+                'ctime'=>date('Y-m-d H:i:s'),
+                'utime'=>date('Y-m-d H:i:s'),
+                'expire_time'=>date('Y-m-d H:i:s',time()+60),
                 'home_team'=>$data['home_team']?:'',
                 'guest_team'=>$data['guest_team']?:'no_team',
                 'lg_id'=>$lg_id,
                 'status'=>$data['status'],
                 'match_date'=>$data['match_date']?:date('Y-m-d'),
-                'match_time'=>$data['match_time']?:date('H:m:i'),
+                'match_time'=>$data['match_time']?:date('H:i:s'),
                 'tag'=>$data['tag']?:0,
                 'is_rollball'=>$data['is_rollball']?:0,
                 'is_today'=>$data['is_today']?:0,
@@ -385,7 +385,7 @@ class WriteSportsController extends BaseController{
             'team'=> $data['team']?:'',
             'lg_id'=> $lg_id,
             'others_lg_id'=> $others_lg_id,
-            'ctime'=> date('Y-m-d H:m:i'),
+            'ctime'=> date('Y-m-d H:i:s'),
         ];
         //更新或写入赔率记录
         if(!empty($oddsRecordID)){
@@ -418,9 +418,9 @@ class WriteSportsController extends BaseController{
             'team'=> $data['team']?:'',
             'lg_id'=> $lg_id,
             'others_lg_id'=> $others_lg_id,
-            'ctime'=> date('Y-m-d H:m:i'),
-            'utime'=> date('Y-m-d H:m:i'),
-            'expire_time'=>date('Y-m-d H:m:i',time()+60),
+            'ctime'=> date('Y-m-d H:i:s'),
+            'utime'=> date('Y-m-d H:i:s'),
+            'expire_time'=>date('Y-m-d H:i:s',time()+60),
         ];
         //更新或写入赔率数据
         if(!empty($oddsID)){
@@ -453,8 +453,8 @@ class WriteSportsController extends BaseController{
             'game_name'=>$data['game_name'],
             'result'=>json_encode($data['result'],JSON_UNESCAPED_UNICODE),
             'status'=>$data['status'],
-            'ctime'=> date('Y-m-d H:m:i'),
-            'utime'=> date('Y-m-d H:m:i'),
+            'ctime'=> date('Y-m-d H:i:s'),
+            'utime'=> date('Y-m-d H:i:s'),
         ];
         //联赛结果数据处理
         if(!empty($lg_result_id)){
@@ -507,7 +507,7 @@ class WriteSportsController extends BaseController{
             "u_home_score"=> $data['u_home_score'],
             "u_guest_score"=> $data['u_guest_score'],
             "p_code"=> $data['p_code'],
-            "update_time"=>date('Y-m-d H:m:i')
+            "update_time"=>date('Y-m-d H:i:s')
         ];
         //赛事结果数据处理
         if(!empty($match_r_id)){
@@ -596,8 +596,8 @@ class WriteSportsController extends BaseController{
             'team'=> $data['team'],
             'lg_id'=> $lg_id,
             'others_lg_id'=> $others_lg_id,
-            'ctime'=> date('Y-m-d H:m:i'),
-            'utime'=> date('Y-m-d H:m:i'),
+            'ctime'=> date('Y-m-d H:i:s'),
+            'utime'=> date('Y-m-d H:i:s'),
         ];
         //更新或写入赔率记录
         if(!empty($oddsID)){
@@ -645,7 +645,7 @@ class WriteSportsController extends BaseController{
                 "match_process"=> $data['match_process']?:'',
                 "tag"=> $data['tag']?:0,
                 "match_id"=> $match_id,
-                "update_time"=>date('Y-m-d H:m:i')
+                "update_time"=>date('Y-m-d H:i:s')
             ];
         };
         if($game_code == 'lq'){
@@ -666,7 +666,7 @@ class WriteSportsController extends BaseController{
                 "match_process"=> $data['match_process']?:'',
                 "tag"=> $data['tag']?:0,
                 "match_id"=> $match_id,
-                "update_time"=>date('Y-m-d H:m:i')
+                "update_time"=>date('Y-m-d H:i:s')
             ];
         }
         if($game_code == 'wq'){
@@ -688,7 +688,7 @@ class WriteSportsController extends BaseController{
                 "second_inning_score"=>$data['second_inning_score']?:0,
                 "third_inning_score"=>$data['third_inning_score']?:0,
                 "match_winer_player"=>$data['match_winer_player']?:'',
-                "update_time"=>date('Y-m-d H:m:i'),
+                "update_time"=>date('Y-m-d H:i:s'),
                 "match_time"=>$data['match_time']?:0,
                 "match_process"=>$data['match_process']?:'',
                 "tag"=>$data['tag']?:0,
@@ -715,7 +715,7 @@ class WriteSportsController extends BaseController{
                 "tag"=> $data['tag']?:0,
                 "match_id"=> $match_id,
                 "all_inning"=>$data['all_inning']?:9,
-                "update_time"=>date('Y-m-d H:m:i'),
+                "update_time"=>date('Y-m-d H:i:s'),
                 "result_mark" =>$data['result_mark']?:'',
             ];
         }

app/Http/Model/StBqResult.php

@@ -18,7 +18,7 @@ class StBqResult extends Model
     public static function BQresult($model){
         //获取赛事表15天内所有非 未开始赛事
         $matchData = $model['model_match']::select('id','match_id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
-            ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
             ->get()
             ->toarray();
 
@@ -26,7 +26,7 @@ class StBqResult extends Model
         if(empty($matchData)) return Response::success();
         //获取赛事结果表 所有当月
         $matchData_r = $model['model_result']::select('match_id')
-            ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
             ->get()
             ->toarray();
 
@@ -44,9 +44,9 @@ class StBqResult extends Model
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "ctime"=>date('Y-m-d H:m:i'),
-                    "update_time"=>date('Y-m-d H:m:i'),
-                    "start_time"=>date('Y-m-d H:m:i',strtotime($start_time))
+                    "ctime"=>date('Y-m-d H:i:s'),
+                    "update_time"=>date('Y-m-d H:i:s'),
+                    "start_time"=>date('Y-m-d H:i:s',strtotime($start_time))
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);
@@ -76,9 +76,9 @@ class StBqResult extends Model
                         "status" => $v['status'],
                         "tag" => $v['tag'],
                         'match_time' => $match_time,
-                        "ctime" => date('Y-m-d H:m:i'),
-                        "update_time" => date('Y-m-d H:m:i'),
-                        "start_time" => date('Y-m-d H:m:i', strtotime($start_time))
+                        "ctime" => date('Y-m-d H:i:s'),
+                        "update_time" => date('Y-m-d H:i:s'),
+                        "start_time" => date('Y-m-d H:i:s', strtotime($start_time))
                     ];
                 }
                 $ret = $model['model_result']::insert($set_match_r);

app/Http/Model/StLqResult.php

@@ -18,7 +18,7 @@ class StLqResult extends Model
     public static function LQresult($model){
         //获取赛事表15天内所有非 未开始赛事
         $matchData = $model['model_match']::select('id','match_id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
-            ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
             ->get()
             ->toarray();
 
@@ -26,7 +26,7 @@ class StLqResult extends Model
         if(empty($matchData)) return Response::success();
         //获取赛事结果表 15天内
         $matchData_r = $model['model_result']::select('match_id')
-            ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
             ->get()
             ->toarray();
         //结果表无数据，直接插入
@@ -51,9 +51,9 @@ class StLqResult extends Model
                     "tag"=> $v['tag'],
                     "match_process"=>$process,
                     'match_time'=>12,
-                    "ctime"=>date('Y-m-d H:m:i'),
-                    "update_time"=>date('Y-m-d H:m:i'),
-                    "start_time"=>date('Y-m-d H:m:i',strtotime($start_time))
+                    "ctime"=>date('Y-m-d H:i:s'),
+                    "update_time"=>date('Y-m-d H:i:s'),
+                    "start_time"=>date('Y-m-d H:i:s',strtotime($start_time))
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);
@@ -90,9 +90,9 @@ class StLqResult extends Model
                         "tag"=> $v['tag'],
                         "match_process"=>$process,
                         'match_time'=>12,
-                        "ctime"=>date('Y-m-d H:m:i'),
-                        "update_time"=>date('Y-m-d H:m:i'),
-                        "start_time"=>date('Y-m-d H:m:i',strtotime($start_time))
+                        "ctime"=>date('Y-m-d H:i:s'),
+                        "update_time"=>date('Y-m-d H:i:s'),
+                        "start_time"=>date('Y-m-d H:i:s',strtotime($start_time))
                     ];
                 }
                 $ret = $model['model_result']::insert($set_match_r);

app/Http/Model/StWqResult.php

@@ -18,7 +18,7 @@ class StWqResult extends Model
     public static function WQresult($model){
         //获取赛事表15天内所有非 未开始赛事
         $matchData = $model['model_match']::select('id','match_id','home_player_name','guest_player_name','lg_id','status','tag','match_date','match_time')
-            ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
             ->get()
             ->toarray();
 
@@ -26,7 +26,7 @@ class StWqResult extends Model
         if(empty($matchData)) return Response::success();
         //获取赛事结果表 所有当月
         $matchData_r = $model['model_result']::select('match_id')
-            ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
             ->get()
             ->toarray();
 
@@ -44,9 +44,9 @@ class StWqResult extends Model
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "ctime"=>date('Y-m-d H:m:i'),
-                    "update_time"=>date('Y-m-d H:m:i'),
-                    "start_time"=>date('Y-m-d H:m:i',strtotime($start_time))
+                    "ctime"=>date('Y-m-d H:i:s'),
+                    "update_time"=>date('Y-m-d H:i:s'),
+                    "start_time"=>date('Y-m-d H:i:s',strtotime($start_time))
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);
@@ -76,9 +76,9 @@ class StWqResult extends Model
                         "status" => $v['status'],
                         "tag" => $v['tag'],
                         'match_time' => $match_time,
-                        "ctime" => date('Y-m-d H:m:i'),
-                        "update_time" => date('Y-m-d H:m:i'),
-                        "start_time" => date('Y-m-d H:m:i', strtotime($start_time))
+                        "ctime" => date('Y-m-d H:i:s'),
+                        "update_time" => date('Y-m-d H:i:s'),
+                        "start_time" => date('Y-m-d H:i:s', strtotime($start_time))
                     ];
                 }
                 $ret = $model['model_result']::insert($set_match_r);

app/Http/Model/StZqResult.php

@@ -17,7 +17,7 @@ class StZqResult extends Model
     public static function ZQresult($model){
         //获取赛事表15天内所有非 未开始赛事
         $matchData = $model['model_match']::select('id','match_id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
-            ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
             ->get()
             ->toarray();
 
@@ -25,7 +25,7 @@ class StZqResult extends Model
         if(empty($matchData)) return Response::success();
         //获取赛事结果表 所有当月
         $matchData_r = $model['model_result']::select('match_id')
-            ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
             ->get()
             ->toarray();
 
@@ -43,9 +43,9 @@ class StZqResult extends Model
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "ctime"=>date('Y-m-d H:m:i'),
-                    "update_time"=>date('Y-m-d H:m:i'),
-                    "start_time"=>date('Y-m-d H:m:i',strtotime($start_time))
+                    "ctime"=>date('Y-m-d H:i:s'),
+                    "update_time"=>date('Y-m-d H:i:s'),
+                    "start_time"=>date('Y-m-d H:i:s',strtotime($start_time))
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);
@@ -75,9 +75,9 @@ class StZqResult extends Model
                         "status" => $v['status'],
                         "tag" => $v['tag'],
                         'match_time' => $match_time,
-                        "ctime" => date('Y-m-d H:m:i'),
-                        "update_time" => date('Y-m-d H:m:i'),
-                        "start_time" => date('Y-m-d H:m:i', strtotime($start_time))
+                        "ctime" => date('Y-m-d H:i:s'),
+                        "update_time" => date('Y-m-d H:i:s'),
+                        "start_time" => date('Y-m-d H:i:s', strtotime($start_time))
                     ];
                 }
                 $ret = $model['model_result']::insert($set_match_r);

app/Lib/Settlement/Adapter/ZqRule.php

@@ -102,7 +102,6 @@ class ZqRule
         $word = $home . '-' . $guest . '(全场)';
         $ret = $this->zq_inball_bigsmall($total, $model->condition, 2, $word);
         return $ret;
-        //return $this->sizeFull($model, $resultModel, $resultRecords, 0, 1);
     }
 
     /**
@@ -112,74 +111,15 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function goal_size_guest($model, $resultModel, $resultRecords)
-    {
-        return $this->sizeFull($model, $resultModel, $resultRecords, 0, -1);
-    }
-
-    /**
-     * 总进球全场|[主、客、全]|大小
-     * @param mixed $model 注单表数据
-     * @param mixed $resultModel 结果表数据
-     * @param mixed $resultRecords 结果记录表数据
-     * @param mixed $type 1：主队  2：客队 0：全部进球 (目前只传 0)
-     * @param mixed $size 1：大  -1：小
-     * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
-     */
-    public function sizeFull($model, $resultModels, $resultRecords, $type, $size)
+    public function goal_size_guest($model, $resultModels, $resultRecords)
     {
         $resultModel = $resultModels['0'];
-        // 总进球数
-        $allGoal = intval($resultModel->home_score) + intval($resultModel->guest_score);
-        // 主队进球数
-        $homeGoal = intval($resultModel->home_score);
-        // 客队进球数
-        $guestGoal = intval($resultModel->guest_score);
-        // 条件
-        $condition = explode("/", $model->condition);
-        $resultArr = [];
-        // 循环对比输赢
-        foreach ($condition as $value) {
-            $absValue = abs($value);
-            if ($type == 1) {
-                $resultScore = $homeGoal - $absValue;
-            } elseif ($type == 2) {
-                $resultScore = $guestGoal - $absValue;
-            } else {
-                $resultScore = $allGoal - $absValue;
-            }
-
-            if ($resultScore > 0) {
-                $resultArr[] = 1;
-            } elseif ($resultScore < 0) {
-                $resultArr[] = -1;
-            } else {
-                $resultArr[] = 0;
-            }
-        }
-        // 去重
-        $resultUniqueArr = array_unique($resultArr);
-
-        // 循环对比让球后输赢
-        $count = count($resultUniqueArr);
-        if ($count == 1) {
-            // 如果猜中
-            if ($resultUniqueArr[0] == $size) {
-                $data['result'] = 1;
-            } elseif ($resultUniqueArr[0] == 0) {
-                // 如果平
-                $data['result'] = 2;
-            } else {
-                // 如果猜错
-                $data['result'] = -1;
-            }
-        } elseif (in_array($size, $resultUniqueArr)) {
-            $data['result'] = 3;
-        } else {
-            $data['result'] = 4;
-        }
-        $data['matchResult'] = "$homeGoal-$guestGoal(全场)";
-        return $data;
+        $home = intval($resultModel->u_home_score);
+        $guest = intval($resultModel->u_guest_score);
+        $total = $home + $guest;
+        $word = $home . '-' . $guest . '(全场)';
+        $ret = $this->zq_inball_bigsmall($total, $model->condition, 1, $word);
+        return $ret;
     }
 
 
@@ -345,7 +285,8 @@ class ZqRule
     public function first_ball_home($model, $resultModel, $resultRecords)
     {
         $resultModel = $resultModel['0'];
-        $word = $resultModel->first_score ? $resultModel->first_score : '无';
+        $word = ($resultModel->first_score != '') ? (($resultModel->first_score == $model->home_team) ? '1:0' : '0:1') : '0:0';
+        $word .= '(主客)';
 
         if (trim($resultModel->first_score) == trim($resultModel->home_team)) {
             return ['result' => 1, 'matchResult' => $word];
@@ -359,7 +300,8 @@ class ZqRule
     public function first_ball_guest($model, $resultModel, $resultRecords)
     {
         $resultModel = $resultModel['0'];
-        $word = $resultModel->first_score ? $resultModel->first_score : '无';
+        $word = ($resultModel->first_score != '') ? (($resultModel->first_score == $model->guest_team) ? '0:1' : '1:0') : '0:0';
+        $word .= '(主客)';
 
         if (trim($resultModel->first_score) == trim($resultModel->guest_team)) {
             return ['result' => 1, 'matchResult' => $word];
@@ -373,7 +315,8 @@ class ZqRule
     public function last_ball_home($model, $resultModel, $resultRecords)
     {
         $resultModel = $resultModel['0'];
-        $word = $resultModel->last_score ? $resultModel->first_score : '无';
+        $word = ($resultModel->last_score != '') ? (($resultModel->last_score == $model->home_team) ? '1:0' : '0:1') : '0:0';
+        $word .= '(主客)';
 
         if (trim($resultModel->last_score) == trim($resultModel->home_team)) {
             return ['result' => 1, 'matchResult' => $word];
@@ -387,9 +330,9 @@ class ZqRule
     //客队|最后进球
     public function last_ball_guest($model, $resultModel, $resultRecords)
     {
-        $pos = count($resultModel) - 1;
-        $resultModel = $resultModel[$pos];
-        $word = $resultModel->last_score ? $resultModel->first_score : '无';
+        $resultModel = $resultModel['0'];
+        $word = ($resultModel->last_score != '') ? (($resultModel->last_score == $model->guest_team) ? '0:1' : '1:0') : '0:0';
+        $word .= '(主客)';
 
         if (trim($resultModel->last_score) == trim($resultModel->guest_team)) {
             return ['result' => 1, 'matchResult' => $word];
@@ -402,10 +345,11 @@ class ZqRule
     //没有进球
     public function not_ball($model, $resultModel, $resultRecords)
     {
-        $pos = count($resultModel) - 1;
-        $resultModel = $resultModel[$pos];
-        $all_score = intval($resultModel->home_score) + intval($resultModel->guest_score);
-        $word = $resultModel->first_score ? $resultModel->first_score : '无';
+        $resultModel = $resultModel['0'];
+        $home = intval($resultModel->home_score);
+        $guest = intval($resultModel->guest_score);
+        $all_score = $home + $guest;
+        $word = ($home > 0 ? 1 : 0) . '-' . ($guest > 0 ? 1 : 0) . '(主客)';
 
         if ($all_score <= 0) {
             return ['result' => 1, 'matchResult' => $word];

app/Models/Comendnotice.php

@@ -14,5 +14,30 @@ class Comendnotice extends BaseModel {
 
     protected $table = 'comendnotice';
 
+    //添加赛事结束纪录
+    function addcomendnotice($match_id){
+        $data = \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->first();
+        if(!$data){
+            $model = new \App\Models\Comendnotice();
+            $model->status = 0;//联赛id
+            $model->game_code = 'zq';
+            $model->match_id = $match_id;//赛事id
+            $model->ctime = date('Y-m-d H:i:s');
+            $model->save();
+
+            $newapp = new \App\Lib\Settlement\SettlementWinFail();
+            $ret = $newapp->doRun($model->id);
+        }else{
+            $newapp = new \App\Lib\Settlement\SettlementWinFail();
+            \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->update(['status'=>0]);
+            $ret = $newapp->doRun($data->toArray()['id']);
+            $ret2 =$data->toArray()['id'];
+            if ($ret2['status']==1){
+                \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->update(['status'=>4]);
+            }
+        }
+        return $ret;
+    }
+
 
 }

app/Models/MoneyBuyStr.php

@@ -31,6 +31,15 @@ class MoneyBuyStr extends BaseModel {
             return -2021052003; //
         }
 
+        //足球赛事
+        $zqmatch =  \App\Models\SportsSoccer::where('status','<>','4')->where('status','<>','6')->get();
+        //篮球赛事
+        $lqmatch =  \App\Models\SportsBasket::where('status','<>','4')->where('status','<>','6')->get();
+        //网球赛事
+        $wqmatch =  \App\Models\SportsTennis::where('status','<>','4')->where('status','<>','6')->get();
+        //棒球赛事
+        $bqmatch =  \App\Models\SportsBase::where('status','<>','4')->where('status','<>','6')->get();
+
         //反水
         $water_return_money = \App\Models\Money_details::where('trade_type','7')->get();
 
@@ -39,6 +48,36 @@ class MoneyBuyStr extends BaseModel {
 
         //订单投注的玩法
         $content = \App\Models\MoneyBuyMatch::where('bet_type','2')->get();
+        for($c=0;$c<count($content);$c++) {
+            if ($content[$c]->game_code == 'zq') {
+                for ($d = 0; $d < count($zqmatch); $d++) {
+                    if ($content[$c]->match_id == $zqmatch[$d]->id) {
+                        $content[$c]->match_status = $zqmatch[$d]->status;
+                    }
+                }
+            }
+            if ($content[$c]->game_code == 'lq') {
+                for ($d = 0; $d < count($lqmatch); $d++) {
+                    if ($content[$c]->match_id == $zqmatch[$d]->id) {
+                        $content[$c]->match_status = $zqmatch[$d]->status;
+                    }
+                }
+            }
+            if ($content[$c]->game_code == 'wq') {
+                for ($d = 0; $d < count($wqmatch); $d++) {
+                    if ($content[$c]->match_id == $zqmatch[$d]->id) {
+                        $content[$c]->match_status = $zqmatch[$d]->status;
+                    }
+                }
+            }
+            if ($content[$c]->game_code == 'bq') {
+                for ($d = 0; $d < count($bqmatch); $d++) {
+                    if ($content[$c]->match_id == $zqmatch[$d]->id) {
+                        $content[$c]->match_status = $zqmatch[$d]->status;
+                    }
+                }
+            }
+        }
 
         for($i=0;$i<count($data);$i++){
             if($data[$i]->status==1 && $data[$i]->settle_status==1){
@@ -106,22 +145,26 @@ class MoneyBuyStr extends BaseModel {
 
             $data[$i]->settle_status = $data[$i]->settle_status;
 
-//            if($data[$i]->settle_status == '未结算'){
-//                $result = array();
-//                for($j=0;$j<count($content);$j++){
-//                    if($data[$i]->batch_id == $content[$j]->batch_id){
-//                        $result[] = $content[$j]->result;
-//                    }
-//                }
-//                if(in_array(0,$result)){
-//                    $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
-//                }else{
-//                    $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerStringNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
-//                }
-//
-//            }else if($data[$i]->settle_status == '已结算'){
-//                $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: #FFAF60;"> 已结算 </a>';
-//            }
+            if($data[$i]->status == 1){
+                if($data[$i]->settle_status == '未结算'){
+                    $match_status = array();
+                    for($j=0;$j<count($content);$j++){
+                        if($data[$i]->batch_id == $content[$j]->batch_id){
+                            $match_status[] = $content[$j]->match_status;
+                        }
+                    }
+                    if(in_array(0,$match_status) || in_array(1,$match_status)){
+                        $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+                    }else{
+                        $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerStringNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
+                    }
+
+                }else if($data[$i]->settle_status == '已结算'){
+                    $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerStringNoteList/resettlement/?id='.$data[$i]->id.'\');">重新结算 </a>';
+                }
+            }else{
+                $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+            }
 
         }
         return $data->toArray();
@@ -197,10 +240,20 @@ class MoneyBuyStr extends BaseModel {
                 }
             }
 
-            if($data[$i]->status == 0){
-                $data[$i]->status = '未结算';
-            }else if($data[$i]->status == 1){
+            if($league->status == 0){
+                $data[$i]->status = '未开始';
+            }else if($league->status == 1){
+                $data[$i]->status = '正在进行';
+            }else if($league->status == 2){
+                $data[$i]->status = '已结束';
+            }else if($league->status == 3){
                 $data[$i]->status = '已结算';
+            }else if($league->status == 4){
+                $data[$i]->status = '已作废';
+            }else if($league->status == 5){
+                $data[$i]->status = '未结算';
+            }else if($league->status == 6){
+                $data[$i]->status = '已取消';
             }
 
             if($data[$i]->result == -1){

app/Models/SportsNoteList.php

@@ -17,7 +17,7 @@ class SportsNoteList extends BaseModel {
             ->join('money_details','money_details.info_identity','=','money_buy_simplex.info_identity')
             ->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy_simplex.match_id')
             ->join('st_'.$type.'_league','st_'.$type.'_competition.lg_id','=','st_'.$type.'_league.lg_id')
-            ->select('money_buy_simplex.id','money_buy_simplex.account_name','money_buy_simplex.account_identity','money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.status','money_buy_simplex.money_time','money_buy_simplex.settle_status','money_buy_simplex.gain_money','money_buy_simplex.game_code','money_buy_simplex.match_id','money_buy_simplex.game_status','st_'.$type.'_competition.home_team','st_'.$type.'_competition.guest_team','st_'.$type.'_competition.match_date','st_'.$type.'_competition.match_time','st_'.$type.'_competition.lg_id','money_details.money_cash','money_buy_simplex.batch_id','st_'.$type.'_league.name_chinese','st_'.$type.'_league.last_time')
+            ->select('money_buy_simplex.id','money_buy_simplex.account_name','money_buy_simplex.account_identity','money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.prize_money','money_buy_simplex.status','money_buy_simplex.money_time','money_buy_simplex.settle_status','money_buy_simplex.gain_money','money_buy_simplex.game_code','money_buy_simplex.match_id','money_buy_simplex.game_status','st_'.$type.'_competition.home_team','st_'.$type.'_competition.guest_team','st_'.$type.'_competition.match_date','st_'.$type.'_competition.match_time','st_'.$type.'_competition.lg_id','st_'.$type.'_competition.status as match_status','money_details.money_cash','money_buy_simplex.batch_id','st_'.$type.'_league.name_chinese','st_'.$type.'_league.last_time')
             ->where($where)
             ->orderby('money_buy_simplex.money_time','desc')
             ->paginate ($list);
@@ -145,15 +145,6 @@ class SportsNoteList extends BaseModel {
                         $content[$b]->condition = '';
                     }
 
-//                    if($content[$b]->result == '0'){
-//                        $data[$i]->str = 1;
-//                    }else{
-//                        if($data[$i]->game_status == '未处理'){
-//                            $data[$i]->str = 2;
-//                        }else{
-//                            $data[$i]->str = 3;
-//                        }
-//                    }
                     $data[$i]->game_status = $data[$i]->game_status;
 
                     //投注详情
@@ -188,15 +179,21 @@ class SportsNoteList extends BaseModel {
                     }
                 }
             }
-//            if($data[$i]->str == 1){
-//                $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
-//            }
-//            if($data[$i]->str == 2){
-//                $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
-//            }
-//            if($data[$i]->str == 3){
-//                $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: #FFAF60;"> 已结算 </a>';
-//            }
+
+            if($data[$i]->status == 1){
+                if($data[$i]->match_status == 0 || $data[$i]->match_status == 1){
+                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+                }
+                if($data[$i]->match_status == 2 || $data[$i]->match_status == 5){
+                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
+                }
+                if($data[$i]->match_status == 3){
+                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+                }
+            }else{
+                $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+            }
+
             $data[$i]->content = $data[$i]->content1.$data[$i]->content;
 
         }