Commit fdfd3958 authored by christ's avatar christ

order_sort

parent 0a7da798
......@@ -407,7 +407,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
public function getOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword)
{
$order = array('gmt_update' => 'desc');
$order = array('add_time' => '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_update'=>'desc'
'add_time'=>'desc'
);
if (!empty($orderState)) {
$where .= ' and han_order.order_state=' . $orderState;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment