yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-01-10 16:19:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: reset traffic

Browse Source
This commit is contained in:
Tokumeikoi 2020-10-11 00:28:09 +08:00
parent 00c5016d5a
commit 56714617ea
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/ConfigController.php
View File

@ -68,7 +68,7 @@ class ConfigController extends Controller
'subscribe' => [ 'subscribe' => [
'plan_change_enable' => (int)config('v2board.plan_change_enable', 1), 'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0), 'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
'renew_reset_traffic_enable' => (int)config('v2board.renew_reset_traffic_enable', 1) 'renew_reset_traffic_enable' => (int)config('v2board.renew_reset_traffic_enable', 0)
], ],
'pay' => [ 'pay' => [
// alipay // alipay

11
app/Services/OrderService.php
View File

@ -54,6 +54,9 @@ class OrderService
default: default:
$this->buyByCycle($order, $user, $plan); $this->buyByCycle($order, $user, $plan);
} }
if ((int)config('v2board.renew_reset_traffic_enable', 0)) $this->buyByResetTraffic($user);
if (!$user->save()) { if (!$user->save()) {
DB::rollBack(); DB::rollBack();
abort(500, '开通失败'); abort(500, '开通失败');
@ -223,10 +226,7 @@ class OrderService
$user->expired_at = time(); $user->expired_at = time();
} }
$user->transfer_enable = $plan->transfer_enable * 1073741824; $user->transfer_enable = $plan->transfer_enable * 1073741824;
// 从一次性转换到循环
// 续费重置&类型=续费
if ((int)config('v2board.renew_reset_traffic_enable', 1) && $order->type === 2) $this->buyByResetTraffic($user);
// 购买前用户过期为NULL（一次性）
if ($user->expired_at === NULL) $this->buyByResetTraffic($user); if ($user->expired_at === NULL) $this->buyByResetTraffic($user);
// 新购 // 新购
if ($order->type === 1) $this->buyByResetTraffic($user); if ($order->type === 1) $this->buyByResetTraffic($user);
@ -237,9 +237,8 @@ class OrderService
private function buyByOneTime(User $user, Plan $plan) private function buyByOneTime(User $user, Plan $plan)
{ {
$this->buyByResetTraffic($user);
$user->transfer_enable = $plan->transfer_enable * 1073741824; $user->transfer_enable = $plan->transfer_enable * 1073741824;
$user->u = 0;
$user->d = 0;
$user->plan_id = $plan->id; $user->plan_id = $plan->id;
$user->group_id = $plan->group_id; $user->group_id = $plan->group_id;
$user->expired_at = NULL; $user->expired_at = NULL;

2
public/assets/admin/umi.js vendored
View File

File diff suppressed because one or more lines are too long