Browse Source

Merge branch 'master' of http://git.bocai108.com:10180/aqm/sports_admin

Jonlin 6 years ago
parent
commit
f16c8fb939

+ 1 - 1
app/Http/Controllers/Admin/SportsfootController.php

@@ -61,7 +61,7 @@ class SportsfootController extends Controller {
 		$simplex_ids = array_column($newapp->allsimplexorder($ssid,'zq'),'order_id');
 		$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
 
-		$update = $this->addcomendnotice($ssid);
+		$update = $this->addcomendnotice($ssid); 
 		if($update['status']==1){
 			$SettlementOrder = new SettlementOrder();
 	        $SettlementOrder->reSettlement($str_ids, 2,$type,'zq',$ssid);//串式

+ 3 - 2
app/Models/MoneyBuyMatch.php

@@ -26,12 +26,13 @@ class MoneyBuyMatch extends Model
     }
 
   	//赛事下所有下注单式下单
-    function allsimplexorder($ssid){ 
+    function allsimplexorder($ssid,$code){ 
         //单式下单
         $where = array();
         $where[] = array('money_buy_match.match_id', '=', $ssid);
         $where[] = array('money_buy_match.bet_type', '=', 1);
-        $data = $this->join('money_buy_simplex','money_buy_match.batch_id','=','money_buy_simplex.batch_id')->select('money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.account_identity','money_buy_simplex.info_identity','money_buy_simplex.match_id')->where($where)->get()->toArray();
+		$where[] = array('money_buy_match.game_code', '=', $code);
+        $data = $this->join('money_buy_simplex','money_buy_match.match_id','=','money_buy_simplex.match_id')->select('money_buy_simplex.order_id','money_buy_simplex.money','money_buy_simplex.account_identity','money_buy_simplex.info_identity','money_buy_simplex.match_id')->where($where)->get()->toArray();
         return $data;
     }
 

+ 2 - 2
resources/views/admin/sportsfoot/outcome.blade.php

@@ -163,8 +163,8 @@
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('zq')"></i></a>
-                        @if(checkRriv('/admin/sportsfoot/addoutcome'))<a href="/admin/sportsfoot/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('zq')">刷新赛事</i></a>
+                        <!-- @if(checkRriv('/admin/sportsfoot/addoutcome'))<a href="/admin/sportsfoot/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif -->
                         @if(checkRriv('/admin/sportsfoot/deleteoutcome'))<a href="javascript:delWin('/admin/sportsfoot/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>
                 </div>