彭俊 6 rokov pred
rodič
commit
fe55219f12

+ 1 - 0
app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -117,6 +117,7 @@ class SoccerStringNoteListController extends Controller
             $where[] = array('money_buy_str.settle_status', '=', $status);
         }
 
+
         /*
             
         if ($status != -1) {

+ 25 - 1
app/Models/MoneyBuyStr.php

@@ -11,8 +11,10 @@ class MoneyBuyStr extends BaseModel {
     protected $table = "money_buy_str";
     public $timestamps = false;
 
-    function getinfo($list = 10, $page, $where = '',$ids)
+    function getinfo($list = 10, $page = 1, $where = [],$ids=[])
     {
+      
+        /*
         if (is_array ($where) && count ($where) > 0) {
             $data = $this
                 ->join('money_details','money_details.info_identity','=','money_buy_str.info_identity')
@@ -29,6 +31,28 @@ class MoneyBuyStr extends BaseModel {
                 ->orderby('money_buy_str.money_time','desc')
                 ->paginate ($list);
         }
+        */
+
+        //如果$ids 有值,则为查询指定赛事注单
+        if(!empty($ids)){
+            $data = $this
+                ->join('money_details','money_details.info_identity','=','money_buy_str.info_identity')
+                ->select('money_buy_str.id','money_buy_str.account_name','money_buy_str.account_identity','money_buy_str.order_id','money_buy_str.str_type','money_buy_str.money','money_buy_str.prize_money','money_buy_str.status','money_buy_str.money_time','money_buy_str.settle_status','money_buy_str.game_status','money_buy_str.gain_money','money_details.money_cash','money_buy_str.batch_id')
+                ->where($where)
+                ->wherein('money_buy_str.order_id',$ids)
+                ->orderby('money_buy_str.money_time','desc')
+                ->paginate ($list);
+        }else{
+            $data = $this
+                ->join('money_details','money_details.info_identity','=','money_buy_str.info_identity')
+                ->select('money_buy_str.id','money_buy_str.account_name','money_buy_str.account_identity','money_buy_str.order_id','money_buy_str.str_type','money_buy_str.money','money_buy_str.prize_money','money_buy_str.status','money_buy_str.money_time','money_buy_str.settle_status','money_buy_str.game_status','money_buy_str.gain_money','money_details.money_cash','money_buy_str.batch_id')
+                ->where($where)
+                ->orderby('money_buy_str.money_time','desc')
+                ->paginate ($list);
+        }
+
+
+
         if (!$data < 0) {
             return -2021052003; //
         }