Merge branch 'feature/order' of http://git.dev.yoho.cn/web/yohobuy into feature/order

@@ -396,7 +396,13 @@ class CartModel
                 $idArr = array();
                 $defaultKey = 0;
                 $oneDeliv = array();
-                foreach ($payReturn['delivery_way'] as $key => $val) {
+
+                $deliveries = $payReturn['delivery_way'];
+                if (isset($orderCompute['delivery_way']) && !empty($orderCompute['delivery_way'])) {
+                    $deliveries = $orderCompute['delivery_way'];
+                }
+
+                foreach ($deliveries as $key => $val) {
                     if ($val['delivery_way_name'] === '顺丰速运' && !$isSunfengSupport) {
                         continue;
                     }