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

feature: more cycle

Browse Source
This commit is contained in:
Tokumeikoi
2020-09-10 21:48:44 +08:00
parent 8a44ccb3fc
commit 85c4e477d2
9 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,6 +153,10 @@ class CheckOrder extends Command
return strtotime('+6 month', $timestamp);
case 'year_price':
return strtotime('+12 month', $timestamp);
case 'two_year_price':
return strtotime('+24 month', $timestamp);
case 'three_year_price':
return strtotime('+36 month', $timestamp);
}
}
}

4
app/Http/Requests/Admin/PlanSave.php
View File

@@ -22,6 +22,8 @@ class PlanSave extends FormRequest
'quarter_price' => 'nullable|integer',
'half_year_price' => 'nullable|integer',
'year_price' => 'nullable|integer',
'two_year_price' => 'nullable|integer',
'three_year_price' => 'nullable|integer',
'onetime_price' => 'nullable|integer',
'reset_price' => 'nullable|integer'
];
@@ -39,6 +41,8 @@ class PlanSave extends FormRequest
'quarter_price.integer' => '季付金额格式有误',
'half_year_price.integer' => '半年付金额格式有误',
'year_price.integer' => '年付金额格式有误',
'two_year_price.integer' => '两年付金额格式有误',
'three_year_price.integer' => '三年付金额格式有误',
'onetime_price.integer' => '一次性金额有误',
'reset_price.integer' => '流量重置包金额有误'
];

2
app/Http/Requests/User/OrderSave.php
View File

@@ -15,7 +15,7 @@ class OrderSave extends FormRequest
{
return [
'plan_id' => 'required',
'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,onetime_price,reset_price'
'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,two_year_price,three_year_price,onetime_price,reset_price'
];
}

4
app/Services/OrderService.php
View File

@@ -110,7 +110,7 @@ class OrderService
$result = $trafficUnitPrice * $notUsedTrafficPrice;
$orderModel = Order::where('user_id', $user->id)->where('cycle', '!=', 'reset_price')->where('status', 3);
$order->surplus_amount = $result > 0 ? $result : 0;
$order->surplus_order_ids = json_encode(array_map(function ($v) { return $v['id'];}, $orderModel->get()->toArray()));
$order->surplus_order_ids = json_encode(array_column($orderModel->get()->toArray(), 'id'));
}
private function getSurplusValueByCycle(User $user, Order $order)
@@ -145,7 +145,7 @@ class OrderService
return;
}
$order->surplus_amount = $orderSurplusAmount > 0 ? $orderSurplusAmount : 0;
$order->surplus_order_ids = json_encode(array_map(function ($v) { return $v['id'];}, $orderModel->get()->toArray()));
$order->surplus_order_ids = json_encode(array_column($orderModel->get()->toArray(), 'id'));
}
public function success(string $callbackNo)