Authored by Rock Zhang

修复使用免邮券快递价格不对应修改的bug

Code Review By Rock Zhang
@@ -396,7 +396,13 @@ class CartModel @@ -396,7 +396,13 @@ class CartModel
396 $idArr = array(); 396 $idArr = array();
397 $defaultKey = 0; 397 $defaultKey = 0;
398 $oneDeliv = array(); 398 $oneDeliv = array();
399 - foreach ($payReturn['delivery_way'] as $key => $val) { 399 +
  400 + $deliveries = $payReturn['delivery_way'];
  401 + if (isset($orderCompute['delivery_way']) && !empty($orderCompute['delivery_way'])) {
  402 + $deliveries = $orderCompute['delivery_way'];
  403 + }
  404 +
  405 + foreach ($deliveries as $key => $val) {
400 if ($val['delivery_way_name'] === '顺丰速运' && !$isSunfengSupport) { 406 if ($val['delivery_way_name'] === '顺丰速运' && !$isSunfengSupport) {
401 continue; 407 continue;
402 } 408 }