Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/models/Business/Order/OrderService.php

@@ -1029,7 +1029,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $data['order_amount']=$newOrderAmount;
         $res=$orderDao->updateByOrderId($data,$orderId);
         $push=\Our\Push::getInstance();
-        $push->updateOrderAmount($orderDetail['storeId'], $orderDetail['orderId'], $orderDetail['orderSn']);
+        $push->updateOrderAmount($orderDetail['buyerId'], $orderDetail['orderId'], $orderDetail['orderSn']);
         $push->sendTcpMessage();
         $messageService->addMessageCenterToDb();
         $orderDao->deleteOrderCache($orderDetail['memberId'], $orderId, $storeId, true);

application/models/Business/Store/ShopkeeperService.php

@@ -407,7 +407,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
     public function getOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword)
     {
 
-        $order = array('add_time' => 'desc');
+        $order = array('gmt_update' => 'desc');
         $orderDao=\DAO\Order\OrderModel::getInstance();
         $storeId = $this->_getStoreByMemberId($memberId);
         if (empty($storeId)) {
@@ -441,7 +441,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 //                        'gmt_update'=>'asc'
 //                    );
                     $order=array(
-                        'add_time'=>'desc'
+                        'gmt_update'=>'desc'
                     );
 //                    $where .= ' and han_order.shipping_type=' . ApiConst::bySeller;
                     $where=$orderDao->getWaitDeliveryCondition($storeId);
@@ -449,7 +449,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
             } else {
                 $order=array(
-                    'add_time'=>'desc'
+                    'gmt_update'=>'desc'
                 );
                 if (!empty($orderState)) {
                     $where .= ' and han_order.order_state=' . $orderState;