Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
ruer_cms
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蔡闯
ruer_cms
Commits
d3fb88ed
Commit
d3fb88ed
authored
Jan 28, 2021
by
蔡闯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2021
parent
e47c0fb6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
app/BaseController.php
app/BaseController.php
+1
-1
app/api/controller/Payorder.php
app/api/controller/Payorder.php
+8
-2
No files found.
app/BaseController.php
View file @
d3fb88ed
...
@@ -77,7 +77,7 @@ abstract class BaseController
...
@@ -77,7 +77,7 @@ abstract class BaseController
}
}
}
}
$phone
=
\think\facade\Request
::
param
(
'phone'
);
$phone
=
\think\facade\Request
::
param
(
'phone'
);
if
(
$phone
)
{
if
(
$phone
!=
''
||
!
isset
(
$phone
)
)
{
if
(
!
isPhoneNo
(
$phone
))
{
if
(
!
isPhoneNo
(
$phone
))
{
echo
json_encode
([
'code'
=>
400
,
'msg'
=>
'手机号码不符合!'
,
'data'
=>
[]]);
exit
;
echo
json_encode
([
'code'
=>
400
,
'msg'
=>
'手机号码不符合!'
,
'data'
=>
[]]);
exit
;
}
}
...
...
app/api/controller/Payorder.php
View file @
d3fb88ed
...
@@ -93,18 +93,24 @@ class Payorder extends Base
...
@@ -93,18 +93,24 @@ class Payorder extends Base
$rest
[
'total_num'
]
=
$total_num
;
$rest
[
'total_num'
]
=
$total_num
;
$rest
[
'name'
]
=
$key
;
$rest
[
'name'
]
=
$key
;
$rest
[
'name_zh'
]
=
$value
;
$rest
[
'name_zh'
]
=
$value
;
//获取最近的支付订单时间
$time
=
Db
::
name
(
'cost'
)
->
where
(
$where
)
->
order
(
'pay_time'
,
'desc'
)
->
value
(
'pay_time'
);
$rest
[
'pay_time'
]
=
$time
;
$all
[]
=
$rest
;
$all
[]
=
$rest
;
}
}
//获取自定义的
//获取自定义的
unset
(
$where
[
'type'
]);
unset
(
$where
[
'type'
]);
$count
=
Db
::
name
(
'cost'
)
->
where
(
$where
)
->
whereNotIn
(
'type'
,
$array_keys
)
->
sum
(
'pay_money'
);
$count
=
Db
::
name
(
'cost'
)
->
where
(
$where
)
->
whereNotIn
(
'type'
,
$array_keys
)
->
sum
(
'pay_money'
);
//获取最近一次支付时间
$time
=
Db
::
name
(
'cost'
)
->
where
(
$where
)
->
whereNotIn
(
'type'
,[
'property'
,
'water'
,
'gas'
,
'electric'
,
'park'
])
->
order
(
'pay_time'
,
'desc'
)
->
value
(
'pay_time'
);
$other
[
'pay_time'
]
=
$time
;
$other
[
'name'
]
=
"other"
;
$other
[
'name'
]
=
"other"
;
$other
[
'name_zh'
]
=
"自定义"
;
$other
[
'name_zh'
]
=
"自定义"
;
$other
[
'total_num'
]
=
$count
;
$other
[
'total_num'
]
=
$count
;
if
(
$other
[
'total_num'
]
!=
0
){
if
(
$other
[
'total_num'
]
!=
0
){
$all
[]
=
$other
;
$all
[]
=
$other
;
}
}
$vacancys
[
$k
][
'pay_list'
]
=
$all
;
$vacancys
[
$k
][
'pay_list'
]
=
Common
::
changeField
(
$all
,
'pay_time'
)
;
//如果当前房间没有已缴费记录,则去掉
//如果当前房间没有已缴费记录,则去掉
if
(
empty
(
$all
))
{
if
(
empty
(
$all
))
{
unset
(
$vacancys
[
$k
]);
unset
(
$vacancys
[
$k
]);
...
@@ -113,7 +119,7 @@ class Payorder extends Base
...
@@ -113,7 +119,7 @@ class Payorder extends Base
}
else
{
}
else
{
$vacancys
=
[];
$vacancys
=
[];
}
}
return
$this
->
returnJson
(
$vacancys
);
return
$this
->
returnJson
(
$vacancys
,
'pay_time'
);
}
}
...
...
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