lip 1 долоо хоног өмнө
parent
commit
47badab664

+ 8 - 1
app/Console/Commands/OperationData.php

@@ -8,6 +8,7 @@ use App\Models\FundsRecord;
 use App\Models\Order;
 use App\Models\Order;
 use App\Models\Wallet;
 use App\Models\Wallet;
 use Carbon\Carbon;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
 
 
 class OperationData extends Command
 class OperationData extends Command
 {
 {
@@ -65,7 +66,13 @@ class OperationData extends Command
 
 
         $data['user_total_money'] = Wallet::query()->sum('available_balance');
         $data['user_total_money'] = Wallet::query()->sum('available_balance');
 
 
-        Operation::updateOrCreate(['date' => $data['date']], $data);
+        $info = Operation::where('date', $data['date'])->first();
+        
+        if (!$info) {
+            DB::table('bot_operation')->insert($data);
+        } else {
+            Operation::where('date', $data['date'])->update($data);
+        }
         return true;
         return true;
     }
     }
 
 

+ 1 - 1
app/Http/Controllers/admin/Banner.php

@@ -95,7 +95,7 @@ class Banner extends Controller
      * @apiParam {int} id 要删除的ID
      * @apiParam {int} id 要删除的ID
      *
      *
      */
      */
-    function destroy()
+    function delete()
     {
     {
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {

+ 1 - 0
app/Http/Controllers/admin/Order.php

@@ -231,6 +231,7 @@ class Order extends Controller
             $order = $order->toArray();
             $order = $order->toArray();
             $order['detail'] = json_decode($order['detail'],true);
             $order['detail'] = json_decode($order['detail'],true);
             $order['game_result']  = $order['game_result'] ? json_decode($order['game_result'],true) : null;
             $order['game_result']  = $order['game_result'] ? json_decode($order['game_result'],true) : null;
+            $order['first_name'] = User::where('user_id', $order['user_id'])->value('first_name');
             ksort($order);
             ksort($order);
         } catch (Exception $e) {
         } catch (Exception $e) {
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());

+ 20 - 2
app/Models/Operation.php

@@ -4,9 +4,27 @@
 namespace App\Models;
 namespace App\Models;
 
 
 
 
+// 关键:导入正确的 Builder 类(Eloquent 构建器)
+use Illuminate\Database\Eloquent\Builder;
+
 class Operation extends BaseModel
 class Operation extends BaseModel
 {
 {
-    protected $table = 'la_operation';
+    
     protected $fillable = ['date', 'recharge', 'withdraw', 'balance_difference', 'total_price', 'user_total_money'];
     protected $fillable = ['date', 'recharge', 'withdraw', 'balance_difference', 'total_price', 'user_total_money'];
+    
+    
+    public function newQuery($excludeDeleted = true): Builder
+    {
+        // 1. 获取原生 Eloquent 查询构建器
+        $query = parent::newQuery($excludeDeleted);
+        
+        // 2. 强制清空当前连接的表前缀(从根源阻止拼接)
+        $this->getConnection()->setTablePrefix('');
+        
+        // 3. 强制指定查询的表名为 la_operation(覆盖所有拼接逻辑)
+        $query->from('bot_operation');
+        
+        return $query;
+    }
+}
 
 
-}

+ 6 - 0
routes/admin.php

@@ -29,6 +29,7 @@ use App\Http\Controllers\admin\PaymentOrder;
 use App\Http\Controllers\admin\PcIssue;
 use App\Http\Controllers\admin\PcIssue;
 use App\Http\Controllers\admin\Order;
 use App\Http\Controllers\admin\Order;
 use App\Http\Controllers\admin\Operation;
 use App\Http\Controllers\admin\Operation;
+use App\Http\Controllers\admin\Banner;
 
 
 Route::post('/login', [Admin::class, 'login']);
 Route::post('/login', [Admin::class, 'login']);
 Route::get('/test', [Wallet::class, 'test']);
 Route::get('/test', [Wallet::class, 'test']);
@@ -224,6 +225,11 @@ Route::middleware(['admin.jwt'])->group(function () {
             Route::get('/exchangeList', [Operation::class, 'exchangeList']);
             Route::get('/exchangeList', [Operation::class, 'exchangeList']);
             Route::get('/index', [Operation::class, 'index']);
             Route::get('/index', [Operation::class, 'index']);
         });
         });
+        Route::prefix('/banner')->group(function () {
+            Route::get('/index', [Banner::class, 'index']);
+            Route::post('/update', [Banner::class, 'update']);
+            Route::get('/delete', [Banner::class, 'delete']);
+        });
 
 
     });
     });