修改bug

app/Http/Controllers/admin/Operation.php

@@ -8,7 +8,7 @@ use App\Models\User;
 use App\Models\FundsRecord;
 use App\Models\Order;
 use App\Models\Operation as OperationModel;
-use Carbon\Carbon;
+use App\Constants\HttpStatus;
 
 class Operation extends Controller
 {
@@ -37,10 +37,11 @@ class Operation extends Controller
             }
 
             $count = $query->count();
-            $list = $query->join('wallets', 'users.member_id', '=', 'wallets.member_id')->orderByDesc("last_login_time")
-                ->select(['users.id', 'users.user_id', 'users.first_name', 'users.money','users.remark','wallets.available_balance as money'])
-                ->paginate($limit)
-                ->toArray();
+            $list = $query->join('wallets', 'users.member_id', '=', 'wallets.member_id')
+                ->select(['users.id', 'users.member_id', 'users.user_id', 'users.first_name', 'users.money','users.remark','wallets.available_balance as money'])
+                ->forPage($page, $limit)
+                ->orderByDesc("last_login_time")
+                ->get()->toArray();
             
             $start = !empty($params['start_time']) ? "{$params['start_time']} 00:00:00" : null;
             $end = !empty($params['end_time']) ? "{$params['end_time']} 23:59:59" : null;
@@ -81,9 +82,9 @@ class Operation extends Controller
                     ->sum('amount'), 2);
             }
         } catch (Exception $e) {
-            return $this->error($e->getMessage());
+            return $this->error(HttpStatus::CUSTOM_ERROR, $e->getMessage());
         }
-        return $this->success(['count' => $count, 'list' => $list]);
+        return $this->success(['total' => $count, 'data' => $list]);
 
     }
 
@@ -126,10 +127,10 @@ class Operation extends Controller
                         $date = date('Y-m-d');
                         break;
                     case "week":
-                        $date = Carbon::now()->startOfWeek()->format('Y-m-d');
+                        $date = date('Y-m-d', strtotime('this week'));
                         break;
                     case "month":
-                        $date = Carbon::now()->firstOfMonth()->format('Y-m-d');
+                        $date = date('Y-m-d', strtotime('this month'));
                         break;
                 }
                 $query->where('date', '>=', $date);
@@ -138,7 +139,6 @@ class Operation extends Controller
             $data['recharge'] = $query1->sum('recharge');
             $data['withdraw'] = $query1->sum('withdraw');
             $data['total_price'] = $query1->sum('total_price');
-            $data['profit_price'] = $query1->sum('profit_price');
             $count = $query->count();
             $list = $query
                 ->forPage($page, $limit)
@@ -147,8 +147,8 @@ class Operation extends Controller
 
 
         } catch (Exception $e) {
-            return $this->error($e->getMessage());
+            return $this->error(HttpStatus::CUSTOM_ERROR, $e->getMessage());
         }
-        return $this->success(['count' => $count, 'list' => $list, 'data' => $data]);
+        return $this->success(['total' => $count, 'data' => $list, 'count' => $data]);
     }
 }

app/Http/Controllers/admin/Order.php

@@ -214,7 +214,7 @@ class Order extends Controller
         } catch (Exception $e) {
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());
         }
-        return $this->success(['count' => $count, 'list' => $list]);
+        return $this->success(['total' => $count, 'data' => $list]);
 
     }
 

app/Models/FundsRecord.php

@@ -1,8 +1,23 @@
 <?php
 namespace App\Models;
 
+// 关键：导入正确的 Builder 类（Eloquent 构建器）
+use Illuminate\Database\Eloquent\Builder;
 class FundsRecord extends BaseModel
 {
-    protected $table = 'balance_logs';
     protected $fillable = ['id', 'room_id', 'member_id' ,'amount' ,'before_balance' ,'after_balance' ,'change_type','created_at','remark'];
+
+    public function newQuery($excludeDeleted = true): Builder
+    {
+        // 1. 获取原生 Eloquent 查询构建器
+        $query = parent::newQuery($excludeDeleted);
+        
+        // 2. 强制清空当前连接的表前缀（从根源阻止拼接）
+        $this->getConnection()->setTablePrefix('');
+        
+        // 3. 强制指定查询的表名为 la_operation（覆盖所有拼接逻辑）
+        $query->from('bot_balance_logs');
+        
+        return $query;
+    }
 }

app/Models/Order.php

@@ -1,9 +1,26 @@
 <?php
 namespace App\Models;
 
+
+// 关键：导入正确的 Builder 类（Eloquent 构建器）
+use Illuminate\Database\Eloquent\Builder;
+
 class Order extends BaseModel
 {
-    protected $table = 'la_sport_order';
     protected $fillable = ['user_id', 'order_id', 'issue' ,'is_roll' ,'amount' ,'cny_rate' ,'win_amount','profit_and_loss','is_faker','is_win', 'stattus','settlement_status',
             'pay_status','pay_time','pay_type','return_status','return_apply_time','return_operation_time','failure_msg', 'create_time' ];
+
+    public function newQuery($excludeDeleted = true): Builder
+    {
+        // 1. 获取原生 Eloquent 查询构建器
+        $query = parent::newQuery($excludeDeleted);
+        
+        // 2. 强制清空当前连接的表前缀（从根源阻止拼接）
+        $this->getConnection()->setTablePrefix('');
+        
+        // 3. 强制指定查询的表名为 la_operation（覆盖所有拼接逻辑）
+        $query->from('la_sport_order');
+        
+        return $query;
+    }
 }