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

application/models/Business/Order/OrderService.php

@@ -485,7 +485,20 @@ class OrderServiceModel extends \Business\AbstractModel
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
 
         if (!empty($orders)) {
+                foreach ($orders as $order) {
+                    //更新订单信息
+                    $updateData = array('order_state' => ApiConst::orderStateClose,'refund_amount'=>$order['orderAmount']);
+                    $update = $orderDao->update(array('order_id' => $order['orderId']),$updateData);
+                    if($update){
+                        if ($order['paymentTime'] > ApiConst::zero && in_array($order['paymentType'], ArrayConst::orderPayTypeOnlines)) {
+                            $this->changeOrderStateCancelUnconditional($order);
+                        }
+                    }
+                    $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId']);
+                }
+
             $orderIds = array_column($orders, 'orderId');
+            //更新商品库存
             $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
             $storeCartsList=array();
             $storeCarts=array();
@@ -506,20 +519,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $orderidsStr=implode(',',array_column($orders,'orderId'));
                 echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
             }
-            echo 1;
-            exit;
-
-                foreach ($orders as $order) {
-                    //更新订单信息
-                    $updateData = array('order_state' => ApiConst::orderStateClose,'refund_amount'=>$order['orderAmount']);
-                    $update = $orderDao->update(array('order_id' => $order['orderId']),$updateData);
-                    if($update){
-                        if ($order['paymentTime'] > ApiConst::zero && in_array($order['paymentType'], ArrayConst::orderPayTypeOnlines)) {
-                            $this->changeOrderStateCancelUnconditional($order);
-                        }
-                    }
-                    $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId']);
-                }
+            //发送消息
             $push = Push::getInstance();
             $push->pushOrderCloseMessage($orders);
 

application/models/DAO/Order/Order.php

@@ -821,7 +821,7 @@ class OrderModel extends \DAO\AbstractModel
     public function getMustCecelRecieveOrders($beginTime=ApiConst::zero, $endTime, $field = '*')
     {
         $this->setDb($this->dbName);
-        $where=Common::format(" payment_time between {0} and {1} and order_state={2}",$beginTime,$endTime,ApiConst::orderStateWaitConfirm);
+        $where=Common::format(" add_time between {0} and {1} and order_state={2}",$beginTime,$endTime,ApiConst::orderStateWaitConfirm);
         $list = $this->db->select($field)->from($this->_tableName)->where($where)->order('payment_time','desc')->fetchAll();
         return $list;
     }