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

application/models/Business/Order/OrderService.php

@@ -860,6 +860,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $storeDao=\DAO\StoreModel::getInstance();
         // $beginTime=0;
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
+        $newOrders=array();
         $orderIds=array();
         if (!empty($orders)) {
             foreach ($orders as $order) {
@@ -877,6 +878,7 @@ class OrderServiceModel extends \Business\AbstractModel
                         }
                         array_push($orderIds,$order['orderId']);
                         $this->updateOrderGoodsStoregeByOrderIds($orderIds);
+                        array_push($newOrders,$order);
                         $orderIds=array();
                         $orderDao->db->doCommit();
                     }
@@ -922,7 +924,7 @@ class OrderServiceModel extends \Business\AbstractModel
 //            $this->updateOrderGoodsStoregeByOrderIds($orderIds);
             //发送消息
             $push = Push::getInstance();
-            $push->pushOrderCloseMessage($orders);
+            $push->pushOrderCloseMessage($newOrders);
 
         }
         file_put_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, $endTime);