lkddi/Xboard
1
0
Fork 0
mirror of https://github.com/lkddi/Xboard.git synced 2026-04-14 11:20:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #658 from xcxnig/patch-2

Browse Source 
fix(order): correct renewal handling for onetime plan
This commit is contained in:
Xboard
2025-08-30 03:15:06 +08:00
committed by GitHub
parent 5f74093660 a8e2452dcc
commit cf10e108ef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/OrderService.php
View File

@@ -162,7 +162,7 @@ class OrderService
} else {
$order->total_amount = (int) ($order->total_amount - $order->surplus_amount);
}
} else if ($user->expired_at > time() && $order->plan_id == $user->plan_id) { // 用户订阅未过期且购买订阅与当前订阅相同 === 续费
} else if (($user->expired_at === null || $user->expired_at > time()) && $order->plan_id == $user->plan_id) { // 用户订阅未过期或按流量订阅 且购买订阅与当前订阅相同 === 续费
$order->type = Order::TYPE_RENEWAL;
} else { // 新购
$order->type = Order::TYPE_NEW_PURCHASE;