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

Logic Consistency Revisions

Browse Source
This commit is contained in:
BrettonYe
2024-10-27 12:48:06 +08:00
parent f280b76b6d
commit 94f1337b5f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,8 +216,8 @@ class UserController extends Controller
$nodes = Node::all();
}
foreach ($goodsList as $goods) {
$goods->node_count = $nodes->where('level', '<=', $goods->level)->count();
$goods->node_countries = $nodes->where('level', '<=', $goods->level)->pluck('country_code')->unique();
$goods->node_count = $nodes->where('level', '<=', $goods->level)->where('status', 1)->count();
$goods->node_countries = $nodes->where('level', '<=', $goods->level)->where('status', 1)->pluck('country_code')->unique();
}
return view('user.services', [

2
app/Services/OrderService.php
View File

@@ -159,7 +159,7 @@ class OrderService
{ // 刷新账号有效时间
$data = ['expired_at' => $this->getFinallyExpiredTime()];
if ($data['expired_at'] === now()->format('Y-m-d')) {
if ($data['expired_at'] < now()->format('Y-m-d')) {
$data = array_merge([
'u' => 0,
'd' => 0,