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

application/models/Business/Order/OrderService.php

@@ -578,7 +578,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $storeDao=\DAO\StoreModel::getInstance();
         //判断订单目前状态是否允许取消
         $isAllowCancel = $orderDao->isAllowCancel($order);
-        $isAllowCancel = true;
+        //$isAllowCancel = true;
         if ($isAllowCancel) {
             $orderDao->db->doTransaction();
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf);