Commit 3abd91fe by 杨苏杭

timer 更改成time

parent cad7e148
...@@ -50,7 +50,7 @@ class BalanceController extends Controller ...@@ -50,7 +50,7 @@ class BalanceController extends Controller
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'pay_amount' => 'required|numeric', 'pay_amount' => 'required|numeric',
'timer' => 'required|integer', 'time' => 'required|integer',
'port_id' => 'required|exists:devices,id|', 'port_id' => 'required|exists:devices,id|',
'station_id' => 'required|exists:stations,id', 'station_id' => 'required|exists:stations,id',
'charger_type' => 'required|integer', 'charger_type' => 'required|integer',
...@@ -88,13 +88,13 @@ class BalanceController extends Controller ...@@ -88,13 +88,13 @@ class BalanceController extends Controller
abort(400, '账户余额小于' . $amount . '元'); abort(400, '账户余额小于' . $amount . '元');
} }
$time = (int)$request->get('timer'); $time = (int)$request->get('time');
$hasRule = false; $hasRule = false;
foreach ($payTemplate as $item) { foreach ($payTemplate as $item) {
if ((int)$item['price'] === (int)($amount) && (int)$item['timer'] === (int)$time) { if ((int)$item['price'] === (int)($amount) && (int)$item['time'] === (int)$time) {
$hasRule = true; $hasRule = true;
......
...@@ -107,14 +107,14 @@ class PayController extends Controller ...@@ -107,14 +107,14 @@ class PayController extends Controller
$amount = $request->get('amount'); $amount = $request->get('amount');
$time = $request->get('timer'); $time = $request->get('time');
$payRule = json_decode($station->getPayTemplate(), true); $payRule = json_decode($station->getPayTemplate(), true);
$result = false; $result = false;
foreach ($payRule as $rule) { foreach ($payRule as $rule) {
if ((int)$rule['price'] === (int)($amount) && $rule['timer'] === (int)$time) { if ((int)$rule['price'] === (int)($amount) && $rule['time'] === (int)$time) {
$result = true; $result = true;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment