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

application/models/Business/Order/OrderService.php

@@ -770,6 +770,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     return true;
                 }else{
                     echo $refundReturnDao->errorMessage."orderId:".$orderId;
+                    return false;
                 }
 
 
@@ -777,7 +778,8 @@ class OrderServiceModel extends \Business\AbstractModel
 
 
         } catch (Exception $e) {
-            throw new \Exception($e->getMessage(),$e->getCode());
+           echo $e->getMessage().$e->getCode();
+            return false;
         }
     }
 
@@ -790,7 +792,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::masterDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
-        $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCancelTime, TIMESTAMP);
+        $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCancelTime);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderCancelBeyondTime;
         $storeDao=\DAO\StoreModel::getInstance();
@@ -798,6 +800,7 @@ class OrderServiceModel extends \Business\AbstractModel
         if (!empty($orders)) {
 
             foreach ($orders as $order) {
+
                 //更新订单信息
                 $updateData = array('order_state' => ApiConst::orderStateCancel,'is_effective'=>ApiConst::cancelOrderAuto);
                 $update = $orderDao->update(array('order_id' => $order['orderId']),$updateData);
@@ -851,20 +854,31 @@ class OrderServiceModel extends \Business\AbstractModel
     public function changeOrderStatus()
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
-        $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, TIMESTAMP);
+        $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderStateWaitConfirmBeyond;
         $storeDao=\DAO\StoreModel::getInstance();
         // $beginTime=0;
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
+        $orderIds=array();
         if (!empty($orders)) {
             foreach ($orders as $order) {
+                 $orderDao->setDb(DbNameConst::masterDBConnectName);
+                $orderDao->db->doTransaction();
                 //更新订单信息
                 $updateData = array('order_state' => ApiConst::orderStateClose,'refund_amount'=>$order['orderAmount'],'gmt_update'=>TIMESTAMP,'is_effective'=>ApiConst::closeOrder);
                 $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);
+                        $isRefunMoney= $this->changeOrderStateCancelUnconditional($order);
+                        if(!$isRefunMoney){
+                            $orderDao->db->doRollback();
+                            continue;
+                        }
+                        array_push($orderIds,$order['orderId']);
+                        $this->updateOrderGoodsStoregeByOrderIds($orderIds);
+                        $orderIds=array();
+                        $orderDao->db->doCommit();
                     }
                     $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
                     $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
@@ -904,8 +918,8 @@ class OrderServiceModel extends \Business\AbstractModel
 
             }
 
-            $orderIds = array_column($orders, 'orderId');
-            $this->updateOrderGoodsStoregeByOrderIds($orderIds);
+//            $orderIds = array_column($orders, 'orderId');
+//            $this->updateOrderGoodsStoregeByOrderIds($orderIds);
             //发送消息
             $push = Push::getInstance();
             $push->pushOrderCloseMessage($orders);