彭俊 6 жил өмнө
parent
commit
00beac1ace

+ 21 - 17
app/Http/Controllers/Admin/SportsbkController.php

@@ -47,25 +47,29 @@ class SportsbkController extends Controller {
 	function revoke(Req $req){
 		$match_id = $req->match_id;//赛事id
 		\App\Models\Stlqresult::where('match_id', $match_id)->update(['status'=>4]);
-		\App\Models\SportsBasket::where('match_id', $match_id)->update(['status'=>4]);
+		\App\Models\SportsBasket::where('id', $match_id)->update(['status'=>4]);
 
+		//赛事下单式注单作废,串关注单下此赛事按平局处理
 		$upapp = new \App\Models\SportsNoteList();
-        $data = $upapp->updatesimplex($match_id,$this->code);//修改单式状态
-
-        //单式撤单返现
-        $newapp = new \App\Models\MoneyBuyMatch();
-		$all = $newapp->allsimplexorder($match_id,$this->code);
-        for ($i=0; $i < count($all); $i++) { 
-	        $appgx = new SettlementOrder();
-	        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
-        }
-
-        //串式撤单只改状态
-        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
-        $csapp = new \App\Models\MoneyBuyStr();
-        $csapp->updatestatus($str_ids);
-        //修改money_buy_match 投注结果result=2为平
-        $newapp->updatast($match_id);
+		$upapp->delorder($match_id,'lq');
+
+//		$upapp = new \App\Models\SportsNoteList();
+//        $data = $upapp->updatesimplex($match_id,$this->code);//修改单式状态
+//
+//        //单式撤单返现
+//        $newapp = new \App\Models\MoneyBuyMatch();
+//		$all = $newapp->allsimplexorder($match_id,$this->code);
+//        for ($i=0; $i < count($all); $i++) {
+//	        $appgx = new SettlementOrder();
+//	        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
+//        }
+//
+//        //串式撤单只改状态
+//        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
+//        $csapp = new \App\Models\MoneyBuyStr();
+//        $csapp->updatestatus($str_ids);
+//        //修改money_buy_match 投注结果result=2为平
+//        $newapp->updatast($match_id);
         
 		return responseToJson(1);
 	}

+ 20 - 16
app/Http/Controllers/Admin/SportsbqController.php

@@ -90,29 +90,33 @@ class SportsbqController extends Controller {
 		$model->status = 4;
 		$model->save();
 
-		$smodel = \App\Models\SportsSoccer::where('match_id', $match_id)->first();
+		$smodel = \App\Models\SportsBase::where('id', $match_id)->first();
 		if($smodel){
 			$smodel->status = 4;
 			$smodel->save();
 		}
 
+		//赛事下单式注单作废,串关注单下此赛事按平局处理
 		$upapp = new \App\Models\SportsNoteList();
-        $data = $upapp->updatesimplex($match_id,'bq');//修改单式状态
+		$upapp->delorder($match_id,'bq');
 
-        //单式撤单返现
-        $newapp = new \App\Models\MoneyBuyMatch();
-		$all = $newapp->allsimplexorder($match_id,'bq');
-        for ($i=0; $i < count($all); $i++) { 
-	        $appgx = new \App\Lib\Settlement\SettlementOrder();
-	        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'bq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
-        }
-
-        //串式撤单只改状态
-        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
-        $csapp = new \App\Models\MoneyBuyStr();
-        $csapp->updatestatus($str_ids);//var_dump($ss);die;
-        //修改money_buy_match 投注结果result=2为平
-        $newapp->updatast($match_id);
+//		$upapp = new \App\Models\SportsNoteList();
+//        $data = $upapp->updatesimplex($match_id,'bq');//修改单式状态
+//
+//        //单式撤单返现
+//        $newapp = new \App\Models\MoneyBuyMatch();
+//		$all = $newapp->allsimplexorder($match_id,'bq');
+//        for ($i=0; $i < count($all); $i++) {
+//	        $appgx = new \App\Lib\Settlement\SettlementOrder();
+//	        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'bq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
+//        }
+//
+//        //串式撤单只改状态
+//        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
+//        $csapp = new \App\Models\MoneyBuyStr();
+//        $csapp->updatestatus($str_ids);//var_dump($ss);die;
+//        //修改money_buy_match 投注结果result=2为平
+//        $newapp->updatast($match_id);
         
 		return responseToJson(1);
 	}

+ 41 - 33
app/Http/Controllers/Admin/SportsfootController.php

@@ -353,34 +353,38 @@ class SportsfootController extends Controller {
 				}
 			}
 			for ($ii=0; $ii < count($ids); $ii++) { 
-				$model = \App\Models\Stzqresult::where('id', $ids[$ii])->first();
+				$model = \App\Models\Stzqresult::where('match_id', $ids[$ii])->first();
 				$model->status = 4;
 				$model->save();
 				$ssid = $model['match_id'];//赛事id
 
-				$smodel = \App\Models\SportsSoccer::where('match_id', $ssid)->first();
+				$smodel = \App\Models\SportsSoccer::where('id', $ssid)->first();
 				if($smodel){
 					$smodel->status = 4;
 					$smodel->save();
 				}
 
+				//赛事下单式注单作废,串关注单下此赛事按平局处理
 				$upapp = new \App\Models\SportsNoteList();
-		        $data = $upapp->updatesimplex($ssid,'zq');//修改单式状态
+				$upapp->delorder($ssid,'zq');
+
+//				$upapp = new \App\Models\SportsNoteList();
+//		        $data = $upapp->updatesimplex($ssid,'zq');//修改单式状态
 
 		        //单式撤单返现
-		        $newapp = new \App\Models\MoneyBuyMatch();
-				$all = $newapp->allsimplexorder($ssid,'zq');
-		        for ($i=0; $i < count($all); $i++) { 
-			        $appgx = new \App\Lib\Settlement\SettlementOrder();
-			        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
-		        }
-
-		        //串式撤单只改状态
-		        $str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-		        $csapp = new \App\Models\MoneyBuyStr();
-		        $csapp->updatestatus($str_ids);//var_dump($ss);die;
-		        //修改money_buy_match 投注结果result=2为平
-		        $newapp->updatast($ssid);
+//		        $newapp = new \App\Models\MoneyBuyMatch();
+//				$all = $newapp->allsimplexorder($ssid,'zq');
+//		        for ($i=0; $i < count($all); $i++) {
+//			        $appgx = new \App\Lib\Settlement\SettlementOrder();
+//			        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
+//		        }
+//
+//		        //串式撤单只改状态
+//		        $str_ids = array_column($newapp->allstrorder($ssid),'order_id');
+//		        $csapp = new \App\Models\MoneyBuyStr();
+//		        $csapp->updatestatus($str_ids);//var_dump($ss);die;
+//		        //修改money_buy_match 投注结果result=2为平
+//		        $newapp->updatast($ssid);
 			}
 			return responseToJson(1);
 		}else{
@@ -389,29 +393,33 @@ class SportsfootController extends Controller {
 			$model->status = 4;
 			$model->save();
 
-			$smodel = \App\Models\SportsSoccer::where('match_id', $match_id)->first();
+			$smodel = \App\Models\SportsSoccer::where('id', $match_id)->first();
 			if($smodel){
 				$smodel->status = 4;
 				$smodel->save();
 			}
 
+			//赛事下单式注单作废,串关注单下此赛事按平局处理
 			$upapp = new \App\Models\SportsNoteList();
-	        $data = $upapp->updatesimplex($match_id,'zq');//修改单式状态
-
-	        //单式撤单返现
-	        $newapp = new \App\Models\MoneyBuyMatch();
-			$all = $newapp->allsimplexorder($match_id,'zq');
-	        for ($i=0; $i < count($all); $i++) { 
-		        $appgx = new \App\Lib\Settlement\SettlementOrder();
-		        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
-	        }
-
-	        //串式撤单只改状态
-	        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
-	        $csapp = new \App\Models\MoneyBuyStr();
-	        $csapp->updatestatus($str_ids);//var_dump($ss);die;
-	        //修改money_buy_match 投注结果result=2为平
-	        $newapp->updatast($match_id);
+			$upapp->delorder($match_id,'zq');
+
+//			$upapp = new \App\Models\SportsNoteList();
+//	        $data = $upapp->updatesimplex($match_id,'zq');//修改单式状态
+
+//	        //单式撤单返现
+//	        $newapp = new \App\Models\MoneyBuyMatch();
+//			$all = $newapp->allsimplexorder($match_id,'zq');
+//	        for ($i=0; $i < count($all); $i++) {
+//		        $appgx = new \App\Lib\Settlement\SettlementOrder();
+//		        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
+//	        }
+
+//	        //串式撤单只改状态
+//	        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
+//	        $csapp = new \App\Models\MoneyBuyStr();
+//	        $csapp->updatestatus($str_ids);//var_dump($ss);die;
+//	        //修改money_buy_match 投注结果result=2为平
+//	        $newapp->updatast($match_id);
 	        
 			return responseToJson(1);
 		}

+ 21 - 17
app/Http/Controllers/Admin/SportswqController.php

@@ -102,29 +102,33 @@ class SportswqController extends Controller {
 		$model->status = 4;
 		$model->save();
 
-		$smodel = \App\Models\SportsSoccer::where('match_id', $match_id)->first();
+		$smodel = \App\Models\SportsTennis::where('id', $match_id)->first();
 		if($smodel){
 			$smodel->status = 4;
 			$smodel->save();
 		}
 
+		//赛事下单式注单作废,串关注单下此赛事按平局处理
 		$upapp = new \App\Models\SportsNoteList();
-        $data = $upapp->updatesimplex($match_id,'wq');//修改单式状态
-
-        //单式撤单返现
-        $newapp = new \App\Models\MoneyBuyMatch();
-		$all = $newapp->allsimplexorder($match_id,'wq');
-        for ($i=0; $i < count($all); $i++) { 
-	        $appgx = new \App\Lib\Settlement\SettlementOrder();
-	        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'wq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
-        }
-
-        //串式撤单只改状态
-        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
-        $csapp = new \App\Models\MoneyBuyStr();
-        $csapp->updatestatus($str_ids);//var_dump($ss);die;
-        //修改money_buy_match 投注结果result=2为平
-        $newapp->updatast($match_id);
+		$upapp->delorder($match_id,'wq');
+
+//		$upapp = new \App\Models\SportsNoteList();
+//        $data = $upapp->updatesimplex($match_id,'wq');//修改单式状态
+//
+//        //单式撤单返现
+//        $newapp = new \App\Models\MoneyBuyMatch();
+//		$all = $newapp->allsimplexorder($match_id,'wq');
+//        for ($i=0; $i < count($all); $i++) {
+//	        $appgx = new \App\Lib\Settlement\SettlementOrder();
+//	        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'wq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
+//        }
+//
+//        //串式撤单只改状态
+//        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
+//        $csapp = new \App\Models\MoneyBuyStr();
+//        $csapp->updatestatus($str_ids);//var_dump($ss);die;
+//        //修改money_buy_match 投注结果result=2为平
+//        $newapp->updatast($match_id);
         
 		return responseToJson(1);
 	}

+ 89 - 18
app/Models/SportsNoteList.php

@@ -146,12 +146,13 @@ class SportsNoteList extends BaseModel
             //投注前后账户金额
             $data[$i]->account_money = $data[$i]->available_cash . '<br><span>' . $data[$i]->money . '</span><br>' . $data[$i]->frozen_cash;
             if ($data[$i]->status == 2 || $data[$i]->status == 3) {
-                for ($b = 0; $b < count($invalid_money); $b++) {
-                    if ($data[$i]->order_id == $invalid_money[$b]->trade_id) {
-                        $data[$i]->available_cash = $invalid_money[$b]->money_cash;
-                        $data[$i]->account_money = $data[$i]->available_cash;
-                    }
-                }
+//                for ($b = 0; $b < count($invalid_money); $b++) {
+//                    if ($data[$i]->order_id == $invalid_money[$b]->trade_id) {
+//                        $data[$i]->available_cash = $invalid_money[$b]->money_cash;
+//                        $data[$i]->account_money = $data[$i]->available_cash;
+//                    }
+//                }
+                $data[$i]->account_money = $data[$i]->available_cash;
             }
             $data[$i]->str = 0;
             for ($b = 0; $b < count($content); $b++) {
@@ -480,12 +481,13 @@ class SportsNoteList extends BaseModel
             //投注前后账户金额
             $data[$i]->account_money = $data[$i]->available_cash . '<br><span>' . $data[$i]->money . '</span><br>' . $data[$i]->frozen_cash;
             if ($data[$i]->status == 2 || $data[$i]->status == 3) {
-                for ($b = 0; $b < count($invalid_money); $b++) {
-                    if ($data[$i]->order_id == $invalid_money[$b]->trade_id) {
-                        $data[$i]->available_cash = $invalid_money[$b]->money_cash;
-                        $data[$i]->account_money = $data[$i]->available_cash;
-                    }
-                }
+//                for ($b = 0; $b < count($invalid_money); $b++) {
+//                    if ($data[$i]->order_id == $invalid_money[$b]->trade_id) {
+//                        $data[$i]->available_cash = $invalid_money[$b]->money_cash;
+//                        $data[$i]->account_money = $data[$i]->available_cash;
+//                    }
+//                }
+                $data[$i]->account_money = $data[$i]->available_cash;
             }
             $data[$i]->str = 0;
             for ($b = 0; $b < count($content); $b++) {
@@ -735,12 +737,13 @@ class SportsNoteList extends BaseModel
             //投注前后账户金额
             $data[$i]->account_money = $data[$i]->available_cash . '<br><span>' . $data[$i]->money . '</span><br>' . $data[$i]->frozen_cash;
             if ($data[$i]->status == 2 || $data[$i]->status == 3) {
-                for ($b = 0; $b < count($invalid_money); $b++) {
-                    if ($data[$i]->order_id == $invalid_money[$b]->trade_id) {
-                        $data[$i]->available_cash = $invalid_money[$b]->money_cash;
-                        $data[$i]->account_money = $data[$i]->available_cash;
-                    }
-                }
+//                for ($b = 0; $b < count($invalid_money); $b++) {
+//                    if ($data[$i]->order_id == $invalid_money[$b]->trade_id) {
+//                        $data[$i]->available_cash = $invalid_money[$b]->money_cash;
+//                        $data[$i]->account_money = $data[$i]->available_cash;
+//                    }
+//                }
+                $data[$i]->account_money = $data[$i]->available_cash;
             }
             $data[$i]->str = 0;
             for ($b = 0; $b < count($content); $b++) {
@@ -868,5 +871,73 @@ class SportsNoteList extends BaseModel
 
     }
 
+    //作废赛事下注单处理
+    function delorder($matchid,$type){
+        //该赛事的单式注单
+        $account_identitys = array();
+        $order_ids = array();
+        $orders = $this->where('match_id',$matchid)->get();
+        if(!empty($orders)){
+            for ($c=0; $c < count($orders); $c++){
+                $account_identitys[] = $orders[$c]['account_identitys'];
+                $order_ids[] = $orders[$c]['order_id'];
+            }
+            //用戶账户金额
+            $account_money = \App\Models\Account_detailed::wherein('account_identity',$account_identitys)->get();
+            //反水
+            $water_return_money = \App\Models\Money_details::wherein('trade_id',$order_ids)->where('trade_type', '7')->get();
+            for($i=0;$i<count($orders);$i++){
+                $available_cash = '';
+                for($a=0;$a<count($account_money);$a++){
+                    if($orders[$i]['account_identity'] == $account_money[$a]['account_identity']){
+                        $available_cash = $account_money[$a]['available_cash'];
+                    }
+                }
+                $water_return = '';
+                for($b=0;$b<count($water_return_money);$b++){
+                    if($orders[$i]['order_id'] == $water_return_money[$b]['trade_id']){
+                        $water_return = $water_return_money[$b]['money'];
+                    } else {
+                        $water_return = 0;
+                    }
+                }
+                $new_available_cash = $available_cash + $orders[$i]->money - $orders[$i]->gain_money - $water_return;
+
+                $models = new \App\Models\Money_details();
+                $models->info_identity = UUID();
+                $models->trade_id = $orders[$i]->order_id;
+                $models->account_name = $orders[$i]->account_name;
+                $models->account_identity = $orders[$i]->account_identity;
+                $models->money = abs($orders[$i]->money - $orders[$i]->gain_money - $water_return);
+                $models->money_time = date("Y-m-d H:i:s", time());
+                if ($new_available_cash > $available_cash) {
+                    $models->money_type = '1';
+                } else {
+                    $models->money_type = '2';
+                }
+                $models->money_cash = $new_available_cash;
+                $models->trade_type = '3';
+                $models->trade_desc = '赛事作废单式注单回款';
+                $models->status = '1';
+                try {
+                    DB::beginTransaction();//开启事务
+                    $this->where('id', $orders[$i]['id'])->update(['status' => '2']);
+                    \App\Models\Account_detailed::where('account_identity', $orders[$i]->account_identity)->update(['available_cash' => $new_available_cash, 'cash' => $new_available_cash]);
+                    $models->save();
+
+                    DB::commit();//提交
+                } catch (Exception $e) {
+                    DB::rollback();//回滚
+                }
+
+            }
+        }
+
+        //该赛事相关的的串关注单做平局处理
+        \App\Models\MoneyBuyMatch::where('match_id',$matchid)->where('game_code',$type)->where('bet_type',2)->update(['result'=>2]);
+
+
+    }
+
 
 }

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

@@ -133,7 +133,7 @@
                         @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=1&id=');" class="layui-btn layui-btn-sm layui-btn-green set">结算全场</a>@endif
                         @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
                         @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm layui-btn-green set">重新结算上半场</a>@endif
-                        @if(checkRriv('/admin/sportsfoot/revokeft'))<a href="javascript:allrevoke('/admin/sportsfoot/revokeft?iszf=1&id=');" class="layui-btn layui-btn-sm  layui-btn-danger">作废</a>@endif
+                        {{--@if(checkRriv('/admin/sportsfoot/revokeft'))<a href="javascript:allrevoke('/admin/sportsfoot/revokeft?iszf=1&id=');" class="layui-btn layui-btn-sm  layui-btn-danger">作废</a>@endif--}}
                     </div>
                 </div>
             </form>