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
3476b542
Commit
3476b542
authored
Dec 13, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dilivery
parent
e425bab8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+3
-3
No files found.
application/models/Business/Store/ShopkeeperService.php
View file @
3476b542
...
@@ -416,7 +416,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -416,7 +416,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
public
function
getOrders
(
$memberId
,
$pageIndex
,
$pageSize
,
$orderState
,
$keyword
)
public
function
getOrders
(
$memberId
,
$pageIndex
,
$pageSize
,
$orderState
,
$keyword
)
{
{
$order
=
array
(
'
update_tim
e'
=>
'desc'
);
$order
=
array
(
'
gmt_updat
e'
=>
'desc'
);
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
();
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
();
$storeId
=
$this
->
_getStoreByMemberId
(
$memberId
);
$storeId
=
$this
->
_getStoreByMemberId
(
$memberId
);
if
(
empty
(
$storeId
))
{
if
(
empty
(
$storeId
))
{
...
@@ -450,7 +450,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -450,7 +450,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
// 'gmt_update'=>'asc'
// 'gmt_update'=>'asc'
// );
// );
$order
=
array
(
$order
=
array
(
'
update_tim
e'
=>
'desc'
'
gmt_updat
e'
=>
'desc'
);
);
// $where .= ' and han_order.shipping_type=' . ApiConst::bySeller;
// $where .= ' and han_order.shipping_type=' . ApiConst::bySeller;
$where
=
$orderDao
->
getWaitDeliveryCondition
(
$storeId
);
$where
=
$orderDao
->
getWaitDeliveryCondition
(
$storeId
);
...
@@ -458,7 +458,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -458,7 +458,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
}
else
{
}
else
{
$order
=
array
(
$order
=
array
(
'
add_tim
e'
=>
'desc'
'
gmt_updat
e'
=>
'desc'
);
);
if
(
!
empty
(
$orderState
))
{
if
(
!
empty
(
$orderState
))
{
$where
.=
' and han_order.order_state='
.
$orderState
;
$where
.=
' and han_order.order_state='
.
$orderState
;
...
...
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