|
|
@@ -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();
|
|
|
;
|