Commit 3476b542 authored by christ's avatar christ

dilivery

parent e425bab8
...@@ -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_time' => 'desc'); $order = array('gmt_update' => '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_time'=>'desc' 'gmt_update'=>'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_time'=>'desc' 'gmt_update'=>'desc'
); );
if (!empty($orderState)) { if (!empty($orderState)) {
$where .= ' and han_order.order_state=' . $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