BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-04 19:49:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 修复商品数量显示10个&&重置流量余额变动的问题

Browse Source
This commit is contained in:
Bob
2022-04-28 16:53:26 +08:00
committed by 兔姬桑
parent 00e84c6c47
commit adfe8b5e89
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/UserController.php
View File

@@ -202,8 +202,8 @@ class UserController extends Controller
$dataPlusDays = $user->reset_time ?? $user->expired_at;
return view('user.services', [
'chargeGoodsList' => Goods::type(3)->whereStatus(1)->orderBy('price')->limit(10)->get(),
'goodsList' => Goods::whereStatus(1)->where('type', '<=', '2')->orderByDesc('type')->orderByDesc('sort')->paginate(10)->appends($request->except('page')),
'chargeGoodsList' => Goods::type(3)->whereStatus(1)->orderBy('price')->limit(99)->get(),
'goodsList' => Goods::whereStatus(1)->where('type', '<=', '2')->orderByDesc('type')->orderByDesc('sort')->paginate(99)->appends($request->except('page')),
'renewTraffic' => $renewPrice->renew ?? 0,
'dataPlusDays' => $dataPlusDays > date('Y-m-d') ? Helpers::daysToNow($dataPlusDays) : 0,
]);
@@ -221,12 +221,12 @@ class UserController extends Controller
$user->update(['u' => 0, 'd' => 0]);
// 扣余额
$user->updateCredit(-$renewCost);
// 记录余额操作日志
Helpers::addUserCreditLog($user->id, null, $user->credit, $user->credit - $renewCost, -1 * $renewCost, trans('user.reset_data.logs'));
// 扣余额
$user->updateCredit(-$renewCost);
return Response::json(['status' => 'success', 'message' => trans('user.reset_data.success')]);
}