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

application/models/Business/Order/OrderService.php

@@ -457,9 +457,9 @@ class OrderServiceModel extends \Business\AbstractModel
         $isAllowCancel = $orderDao->isAllowCancel($order);
         //$isAllowCance = true;
         if ($isAllowCancel) {
+            $orderDao->db->doTransaction();
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf);
             $orderDao->setDb($orderDao->dbName);
-            $orderDao->db->doTransaction();
             if ($res) {
                 $this->updateOrderGoodsStoregeByOrderIds(array($orderId));
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);