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

optimization: code

Browse Source
This commit is contained in:
Tokumeikoi
2020-09-11 01:02:31 +08:00
parent e1cac79318
commit fe0332a9f9
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Console/Commands/CheckOrder.php
View File

@@ -7,8 +7,6 @@ use Illuminate\Console\Command;
use App\Models\Order; use App\Models\Order;
use App\Models\User; use App\Models\User;
use App\Models\Plan; use App\Models\Plan;
use App\Utils\Helper;
use App\Models\Coupon;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
class CheckOrder extends Command class CheckOrder extends Command
@@ -83,10 +81,10 @@ class CheckOrder extends Command
} }
switch ((string)$order->cycle) { switch ((string)$order->cycle) {
case 'onetime_price': case 'onetime_price':
$this->buyByOneTime($order, $user, $plan); $this->buyByOneTime($user, $plan);
break; break;
case 'reset_price': case 'reset_price':
$this->buyReset($user); $this->buyByResetTraffic($user);
break; break;
default: default:
$this->buyByCycle($order, $user, $plan); $this->buyByCycle($order, $user, $plan);
@@ -104,7 +102,7 @@ class CheckOrder extends Command
DB::commit(); DB::commit();
} }
private function buyReset(User $user) private function buyByResetTraffic(User $user)
{ {
$user->u = 0; $user->u = 0;
$user->d = 0; $user->d = 0;
@@ -119,17 +117,17 @@ class CheckOrder extends Command
$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->buyReset($user); if ((int)config('v2board.renew_reset_traffic_enable', 1) && $order->type === 2) $this->buyByResetTraffic($user);
// 购买前用户过期为NULL（一次性） // 购买前用户过期为NULL（一次性）
if ($user->expired_at === NULL) $this->buyReset($user); if ($user->expired_at === NULL) $this->buyByResetTraffic($user);
// 新购 // 新购
if ($order->type === 1) $this->buyReset($user); if ($order->type === 1) $this->buyByResetTraffic($user);
$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 = $this->getTime($order->cycle, $user->expired_at); $user->expired_at = $this->getTime($order->cycle, $user->expired_at);
} }
private function buyByOneTime(Order $order, User $user, Plan $plan) private function buyByOneTime(User $user, Plan $plan)
{ {
$user->transfer_enable = $plan->transfer_enable * 1073741824; $user->transfer_enable = $plan->transfer_enable * 1073741824;
$user->u = 0; $user->u = 0;

4
app/Services/OrderService.php
View File

@@ -106,8 +106,8 @@ class OrderService
if ($user->discount && $trafficUnitPrice) { if ($user->discount && $trafficUnitPrice) {
$trafficUnitPrice = $trafficUnitPrice - ($trafficUnitPrice * $user->discount / 100); $trafficUnitPrice = $trafficUnitPrice - ($trafficUnitPrice * $user->discount / 100);
} }
$notUsedTrafficPrice = $plan->transfer_enable - (($user->u + $user->d) / 1073741824); $notUsedTraffic = $plan->transfer_enable - (($user->u + $user->d) / 1073741824);
$result = $trafficUnitPrice * $notUsedTrafficPrice; $result = $trafficUnitPrice * $notUsedTraffic;
$orderModel = Order::where('user_id', $user->id)->where('cycle', '!=', 'reset_price')->where('status', 3); $orderModel = Order::where('user_id', $user->id)->where('cycle', '!=', 'reset_price')->where('status', 3);
$order->surplus_amount = $result > 0 ? $result : 0; $order->surplus_amount = $result > 0 ? $result : 0;
$order->surplus_order_ids = json_encode(array_column($orderModel->get()->toArray(), 'id')); $order->surplus_order_ids = json_encode(array_column($orderModel->get()->toArray(), 'id'));