Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
c6837123
Commit
c6837123
authored
Feb 09, 2019
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test
parent
40221ea7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Order.php
application/controllers/Order.php
+0
-3
OrderService.php
application/models/Business/Order/OrderService.php
+3
-0
No files found.
application/controllers/Order.php
View file @
c6837123
...
@@ -20,9 +20,6 @@ class OrderController extends \Our\Controller_AbstractApi {
...
@@ -20,9 +20,6 @@ class OrderController extends \Our\Controller_AbstractApi {
}
}
$keyword
=
$this
->
req
[
\Our\NameConst
::
data
][
'keyword'
]
?
$this
->
req
[
\Our\NameConst
::
data
][
'keyword'
]
:
FAlSE
;
$keyword
=
$this
->
req
[
\Our\NameConst
::
data
][
'keyword'
]
?
$this
->
req
[
\Our\NameConst
::
data
][
'keyword'
]
:
FAlSE
;
$orders
=
$orderService
->
getList
(
$this
->
memberId
,
$keyword
,
$pageIndex
,
$pageSize
,
$orderState
);
$orders
=
$orderService
->
getList
(
$this
->
memberId
,
$keyword
,
$pageIndex
,
$pageSize
,
$orderState
);
if
(
!
empty
(
$keyWord
)){
throw
new
\Exception
(
json_encode
(
$orders
));
}
$this
->
success
(
$orders
);
$this
->
success
(
$orders
);
...
...
application/models/Business/Order/OrderService.php
View file @
c6837123
...
@@ -414,6 +414,9 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -414,6 +414,9 @@ class OrderServiceModel extends \Business\AbstractModel
}
}
$returnData
[
'orders'
]
=
$orderMerge
;
$returnData
[
'orders'
]
=
$orderMerge
;
$returnData
[
'totalCount'
]
=
$orders
[
'totalCount'
];
$returnData
[
'totalCount'
]
=
$orders
[
'totalCount'
];
if
(
!
empty
(
$returnData
)){
throw
new
\Exception
(
json_encode
(
$returnData
));
}
return
$returnData
;
return
$returnData
;
}
else
{
}
else
{
return
Array
(
return
Array
(
...
...
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