jekon преди 6 години
родител
ревизия
9b1e773436

+ 7 - 6
app/Http/Controllers/Admin/BalanceController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\BalanceCreateRequest;
 use App\Http\Requests\BalanceUpdateRequest;
+use App\Models\AppBalance;
 use App\Models\Balance;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -28,7 +29,7 @@ class BalanceController extends Controller
             ->select(['ag_balance_log.*','ag_app.appname','ag_party.name'])
             ->leftJoin('ag_app', 'ag_balance_log.app_id', '=', 'ag_app.id')
             ->leftJoin('ag_party', 'ag_balance_log.party_id', '=', 'ag_party.id')
-            ->orderBy('ag_balance_log.id','asc')
+            ->orderBy('ag_balance_log.id','desc')
             ->paginate($request->get('limit', 30))
             ->toArray();
         ;
@@ -52,12 +53,12 @@ class BalanceController extends Controller
 
     public function appData(Request $request)
     {
-        $balanceModel = new Balance();
+        $balanceModel = new AppBalance();
         $res = $balanceModel
-            ->select(['ag_balance_log.*','ag_app.appname','ag_party.name'])
-            ->leftJoin('ag_app', 'ag_balance_log.app_id', '=', 'ag_app.id')
-            ->leftJoin('ag_party', 'ag_balance_log.party_id', '=', 'ag_party.id')
-            ->orderBy('ag_balance_log.id','asc')
+            ->select(['ag_app_balance_log.*','ag_app.appname','ag_party.name'])
+            ->leftJoin('ag_app', 'ag_app_balance_log.app_id', '=', 'ag_app.id')
+            ->leftJoin('ag_party', 'ag_app_balance_log.party_id', '=', 'ag_party.id')
+            ->orderBy('ag_app_balance_log.id','desc')
             ->paginate($request->get('limit', 30))
             ->toArray();
         ;

+ 14 - 0
app/Models/AppBalance.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AppBalance extends Model
+{
+    protected $table = 'ag_app_balance_log';
+
+    protected $fillable = ['id','type','money', 'app_id', 'app_username', 'party_id', 'party_username', 'billno','balance', 'update_at'];
+
+
+}

+ 1 - 0
resources/views/admin/balance/appIndex.blade.php

@@ -44,6 +44,7 @@
                     ,{field: 'app_username', title: '平台用户名'}
                     ,{field: 'money', title: '金额'}
                     ,{field: 'typename', title: '类型'}
+                    ,{field: 'balance', title: '余额'}
                     ,{field: 'name', title: '第三方名'}
                     ,{field: 'created_at', title: '时间'}
                 ]]

+ 1 - 0
resources/views/admin/balance/index.blade.php

@@ -45,6 +45,7 @@
                     ,{field: 'money', title: '金额'}
                     ,{field: 'typename', title: '类型'}
                     ,{field: 'appname', title: '平台名'}
+                    ,{field: 'balance', title: '剩余余额'}
                     ,{field: 'created_at', title: '时间'}
                 ]]
             });