异常处理

app/Lib/Biz/Sport/Common.php

@@ -1432,7 +1432,7 @@ class Common
 		}else{
             //未结算赛事 处理 下单式注单作废，串关注单下此赛事按平局处理
             if(count($oddsData_str) > 0){
-                $oddsData_str = $oddsData_str->toArray();
+                $oddsData_str = $oddsData_str;
             }
             $type = 1;
 			$upapp = new \App\Models\SportsNoteList();

app/Models/SportsNoteList.php

@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\DB;
 use App\Lib\Biz\Sport\Common as commonFunction;
 use App\Models\MoneyBuyMatchb;
 use App\Http\Response\Response;
-use App\Http\Model\StZqResult;
+//use App\Http\Model\StZqResult;
 
 use App\Http\Model\StZqMatch as ZqMatchModel;
 use App\Http\Model\StLqMatch as LqMatchModel;
@@ -976,17 +976,24 @@ class SportsNoteList extends BaseModel
             //有注单时 按注单处理
             $orders = $orders_sim;
         }
+        //去除数组的空值
+        foreach( $orders as $k=>$v){
+            if( !$v )
+                unset( $orders[$k] );
+        }
+
         $order_ids = array();
         if(!empty($orders)){
-            for ($c=0; $c < count($orders); $c++){
-                $account_identitys[] = $orders[$c]['account_identity'];
-                $order_ids[] = $orders[$c]['order_id'];
+            foreach( $orders as $k=>$v){
+                $account_identitys[] = $v['account_identity'];
+                $order_ids[] = $v['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();
-            //print_r($orders);exit;
+
             //订单反水
             foreach($water_return_money as $k=>$v){
                 foreach($orders as $kk=>$vv){
@@ -1030,7 +1037,7 @@ class SportsNoteList extends BaseModel
                 }
                 $models->money_cash = $v['available_cash'];
                 $models->trade_type = '3';
-                $models->trade_desc = '赛事作废单式注单回款';
+                $models->trade_desc = '赛事作废单式注单回款'.$change_money.'元，订单号'.$v['order_id'];
                 $models->status = '1';
                 try {
                     DB::beginTransaction();//开启事务
@@ -1042,61 +1049,8 @@ class SportsNoteList extends BaseModel
                 } catch (Exception $e) {
                     DB::rollback();//回滚
                 }
-
             }
 
-//            //用户账户余额计算
-//            foreach($account_money as $k=>$v){
-//                //默认 余额 0
-//                $account_identity = 0;
-//                foreach($water_return_money as $kk=>$vv){
-//                    foreach($orders as $kkk=>$vvv){
-//                        //计算当前余额
-//                        if($v['account_identity'] == $vvv['account_identity'] && $vv['trade_id'] == $vvv['order_id']){
-//                            //第一个注单 获取用户初始余额
-//                            if($account_identity == 0){
-//                                //当前注单余额
-//                                $vvv['available_cash'] = $v['available_cash'];
-//                                //当前注单退款后的余额
-//                                $account_identity = $v['available_cash']+$vvv['money']-$vv['money']-$vvv['gain_money'];
-//                            }else{//其他 获取 上个注单处理后的余额
-//                                $vvv['available_cash'] = $account_identity;
-//                                $account_identity = $account_identity+$vvv['money']-$vv['money']-$vvv['gain_money'];
-//                            }
-//                            $orders[$kkk] = $vvv;
-//
-//                            $models = new \App\Models\Money_details();
-//                            $models->info_identity = UUID();
-//                            $models->trade_id = $vvv['order_id'];
-//                            $models->account_name = $vvv['account_name'];
-//                            $models->account_identity = $vvv['account_identity'];
-//                            $change_money = $vvv['money'] - $vv['money'] - $vvv['gain_money'];
-//                            $models->money = abs($change_money);
-//                            $models->money_time = date("Y-m-d H:i:s", time());
-//                            if ($change_money > 0) {
-//                                $models->money_type = '1';
-//                            } else {
-//                                $models->money_type = '2';
-//                            }
-//                            $models->money_cash = $vvv['available_cash'];
-//                            $models->trade_type = '3';
-//                            $models->trade_desc = '赛事作废单式注单回款';
-//                            $models->status = '1';
-//                            try {
-//                                DB::beginTransaction();//开启事务
-//                                $this->where('order_id', $vvv['order_id'])->update(['status' => '2','use_mark'=>'通过设置赛事比分作废']);
-//                                \App\Models\Account_detailed::where('account_identity', $vvv['account_identity'])->update(['available_cash' => $vvv['available_cash'], 'cash' => $vvv['available_cash']]);
-//                                $models->save();
-//
-//                                DB::commit();//提交
-//                            } catch (Exception $e) {
-//                                DB::rollback();//回滚
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-
         }
 
         //该赛事相关的的串关注单做平局处理

public/admin/css/rewrite.css

@@ -68,7 +68,7 @@
 }
 .container .layui-border-box{
     /*margin-top: 62px;*/
-    width: fit-content;
+    /*width: fit-content;*/
     width: -moz-fit-content;
     height: 100%;
 }