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
fdfd3958
Commit
fdfd3958
authored
Dec 05, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
order_sort
parent
0a7da798
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+7
-4
No files found.
application/models/Business/Store/ShopkeeperService.php
View file @
fdfd3958
...
...
@@ -407,7 +407,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
public
function
getOrders
(
$memberId
,
$pageIndex
,
$pageSize
,
$orderState
,
$keyword
)
{
$order
=
array
(
'
gmt_updat
e'
=>
'desc'
);
$order
=
array
(
'
add_tim
e'
=>
'desc'
);
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
();
$storeId
=
$this
->
_getStoreByMemberId
(
$memberId
);
if
(
empty
(
$storeId
))
{
...
...
@@ -436,9 +436,12 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
// $where .= ' and han_order.shipping_type=' . ApiConst::bySelf;
$where
=
$orderDao
->
getByselfCondition
(
$storeId
);
}
else
{
// $order=array(
// 'diliveryman_id'=>'asc',
// 'gmt_update'=>'asc'
// );
$order
=
array
(
'diliveryman_id'
=>
'asc'
,
'gmt_update'
=>
'asc'
'add_time'
=>
'desc'
);
// $where .= ' and han_order.shipping_type=' . ApiConst::bySeller;
$where
=
$orderDao
->
getWaitDeliveryCondition
(
$storeId
);
...
...
@@ -446,7 +449,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
}
else
{
$order
=
array
(
'
gmt_updat
e'
=>
'desc'
'
add_tim
e'
=>
'desc'
);
if
(
!
empty
(
$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