追加推送 5/8

app/Lib/Settlement/SettlementOrder.php

@@ -86,7 +86,7 @@ class SettlementOrder extends SettlementBase
             -> where(['order_id' => $order_id])
             -> first();
         // 查询单式注单下的所有玩法
-        $matchData = DB :: table('money_buy_match') -> select('odds', 'result', 'batch_id', 'bet_money') -> where(['bet_type' => 1, 'batch_id' => $simplexData -> batch_id]);
+        $matchData = DB :: table('money_buy_match') -> select('odds', 'result', 'batch_id', 'bet_money') -> where(['bet_type' => 1, 'batch_id' => $simplexData -> batch_id, 'match_id' => $simplexData->match_id]);
         $matchData = $matchData -> where(function($query) {
             $query = $query -> where(['result' => 1])
                 -> orWhere(['result' => 2])
@@ -198,7 +198,7 @@ class SettlementOrder extends SettlementBase
     //单个串式订单的处理
     public function  ChuanOrder($order_id){
               $batch_id = $this->BuyDatasMainModel->batch_id ;
-              $matchModels = DB::table('money_buy_match')->where(['batch_id'=>$batch_id])->get();
+              $matchModels = DB::table('money_buy_match')->where(['batch_id'=>$batch_id,'bet_type' => 2])->get();
               if (empty($matchModels)) {   throw  new  \Exception('match 数据异常');}
 
               $in_array = [] ;
@@ -233,31 +233,6 @@ class SettlementOrder extends SettlementBase
 
                return true ;
 
-                  /*
-                  $ret = DB::update('update money_buy_str  set settle_status=2 , game_status=1 , gain_money=?  where order_id = ?', [$money,$order_id]);
-                  if(!($ret || $ret===0)){                     throw  new \Exception('更新数据出错3!');             }
-
-                  $account_identity = $this->BuyDatasMainModel->account_identity ;
-                  $ret1 = DB::update("update  account_detailed  set  available_cash=available_cash+$money , cash=cash+$money  where  account_identity='$account_identity' ") ;
-
-                  $allbuyModel = $this->BuyDatasMainModel ;
-                  $dtime = date("Y-m-d H:i:s");
-                  $uuid = self::UUID();
-                  $userInfoArray = $this->getUserInfo($allbuyModel->account_name);
-                  $cashmoney = $userInfoArray['detail']->cash;
-
-                  $SQL  = "insert into money_details(info_identity,trade_id,account_name,account_identity,money,money_time,money_type,trade_desc,status,money_cash,trade_type) values";
-                  $SQL .= "('$uuid','$allbuyModel->order_id','$allbuyModel->account_name','$allbuyModel->account_identity','$money','$dtime',1,'中奖收入','1','$cashmoney',4)" ;
-
-                  $ret2 =  DB::insert($SQL);
-
-                  if ($ret1 && $ret2){
-                      return true;
-                  }
-
-                  throw  new \Exception('更新数据出错4!');
-                   */
-
             }
 
 

app/Lib/Settlement/SettlementWinFail.php

@@ -298,9 +298,8 @@ class SettlementWinFail
         $table = 'st_'.$matchModel->game_code.'_league_result';
         $where = ['lg_id'=>$matchModel->lg_id,'game_name'=>$matchModel->odds_code];
         $model = DB::table($table)->where($where)->first();
-        if (!empty($model)){
-            $this->gjModel = $model ;
-        }
+        if (empty($model)){        throw new  \Exception('冠军数据没找到!');      }
+        $this->gjModel = $model ;
         return $model ;
     }
 

app/Models/MoneyBuyStr.php

@@ -72,7 +72,7 @@ class MoneyBuyStr extends BaseModel {
 
             if($data[$i]->settle_status == '未结算'){
                 $result = array();
-                $matchs = DB::table('money_buy_match')->where('batch_id',$data[$i]->batch_id)->where('bet_type',2)->get();
+                $matchs = DB::table('money_buy_match')->where('batch_id',$data[$i]->batch_id)->where('bet_type','2')->get();
                 for($j=0;$j<count($matchs);$j++){
                     $result[] = $matchs[$j]->result;
                 }
@@ -84,7 +84,7 @@ class MoneyBuyStr extends BaseModel {
 
             }else if($data[$i]->settle_status == '已结算'){
 //                $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerStringNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
-                $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>';
+                $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>';
             }
 
         }
@@ -110,7 +110,7 @@ class MoneyBuyStr extends BaseModel {
     //获取串关注单详情信息
     function getdetailinfo($id) {
         $res = $this->where('id',$id)->first();
-        $data = DB::table('money_buy_match')->where('batch_id',$res->batch_id)->get();
+        $data = DB::table('money_buy_match')->where('batch_id',$res->batch_id)->where('bet_type','2')->get();
         $game_type = DB::table('st_game_type')->get();
         for($i=0;$i<count($data);$i++){
             $league = DB::table('st_'.$data[$i]->game_code.'_league')->where('lg_id',$data[$i]->lg_id)->first();

app/Models/SportsNoteList.php

@@ -59,7 +59,7 @@ class SportsNoteList extends BaseModel {
             $data[$i]->available_cash = $data[$i]->money+$data[$i]->money_cash.'.00';
             $data[$i]->account = $data[$i]->available_cash.'<br><span>'.$data[$i]->account_name.'</span><br>'.$data[$i]->frozen_cash;
 
-            $content = DB::table('money_buy_match')->where('batch_id',$data[$i]->batch_id)->where('match_id',$data[$i]->match_id)->get();
+            $content = DB::table('money_buy_match')->where('batch_id',$data[$i]->batch_id)->where('match_id',$data[$i]->match_id)->where('bet_type','1')->get();
             if($content[0]->result == '0'){
                 $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>';
             }else{
@@ -67,7 +67,7 @@ class SportsNoteList extends BaseModel {
                     $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>';
                 }else{
                     //$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>';
-                    $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: grey;"> 已结算 </a>';
+                    $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>';
                 }
             }