Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cdz_pay_v2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨苏杭
cdz_pay_v2
Commits
3abd91fe
Commit
3abd91fe
authored
Nov 30, 2018
by
杨苏杭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
timer 更改成time
parent
cad7e148
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/Http/Controllers/V1/Charger/BalanceController.php
+3
-3
app/Http/Controllers/V1/Wx/PayController.php
+2
-2
No files found.
app/Http/Controllers/V1/Charger/BalanceController.php
View file @
3abd91fe
...
...
@@ -50,7 +50,7 @@ class BalanceController extends Controller
$validator
=
Validator
::
make
(
$request
->
all
(),
[
'pay_amount'
=>
'required|numeric'
,
'time
r
'
=>
'required|integer'
,
'time'
=>
'required|integer'
,
'port_id'
=>
'required|exists:devices,id|'
,
'station_id'
=>
'required|exists:stations,id'
,
'charger_type'
=>
'required|integer'
,
...
...
@@ -88,13 +88,13 @@ class BalanceController extends Controller
abort
(
400
,
'账户余额小于'
.
$amount
.
'元'
);
}
$time
=
(
int
)
$request
->
get
(
'time
r
'
);
$time
=
(
int
)
$request
->
get
(
'time'
);
$hasRule
=
false
;
foreach
(
$payTemplate
as
$item
)
{
if
((
int
)
$item
[
'price'
]
===
(
int
)(
$amount
)
&&
(
int
)
$item
[
'time
r
'
]
===
(
int
)
$time
)
{
if
((
int
)
$item
[
'price'
]
===
(
int
)(
$amount
)
&&
(
int
)
$item
[
'time'
]
===
(
int
)
$time
)
{
$hasRule
=
true
;
...
...
app/Http/Controllers/V1/Wx/PayController.php
View file @
3abd91fe
...
...
@@ -107,14 +107,14 @@ class PayController extends Controller
$amount
=
$request
->
get
(
'amount'
);
$time
=
$request
->
get
(
'time
r
'
);
$time
=
$request
->
get
(
'time'
);
$payRule
=
json_decode
(
$station
->
getPayTemplate
(),
true
);
$result
=
false
;
foreach
(
$payRule
as
$rule
)
{
if
((
int
)
$rule
[
'price'
]
===
(
int
)(
$amount
)
&&
$rule
[
'time
r
'
]
===
(
int
)
$time
)
{
if
((
int
)
$rule
[
'price'
]
===
(
int
)(
$amount
)
&&
$rule
[
'time'
]
===
(
int
)
$time
)
{
$result
=
true
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment