ztt 10 months ago
parent 5aed6588cb
commit b58aa67664
  1. 5
      addons/shopro/service/order/OrderCreate.php

@ -347,7 +347,7 @@ class OrderCreate
// 获取快递配送数据 // 获取快递配送数据
// if ($buyInfo['dispatch_type'] == 'express' // if ($buyInfo['dispatch_type'] == 'express'
if (in_array('express', $buyInfo['dispatch_type']) if ($this->dispatch_type == 'express'
&& (!$this->activity['activity'] // 没有活动 && (!$this->activity['activity'] // 没有活动
|| ( || (
$this->activity['activity'] // 有活动,并且(没有是否包邮字段,或者是不包邮) $this->activity['activity'] // 有活动,并且(没有是否包邮字段,或者是不包邮)
@ -357,7 +357,8 @@ class OrderCreate
) { ) {
if ($this->userAddress) { if ($this->userAddress) {
if (!isset($this->orderData['dispatch_infos'][$goods['dispatch_id']]['finalExpress'])) { if (!isset($this->orderData['dispatch_infos'][$goods['dispatch_id']]['finalExpress'])) {
$finalExpress = $this->getDispatchExpress($buyInfo['dispatch_type'], $goods['dispatch_id']); // $finalExpress = $this->getDispatchExpress($buyInfo['dispatch_type'], $goods['dispatch_id']);
$finalExpress = $this->getDispatchExpress($this->dispatch_type, $goods['dispatch_id']);
} else { } else {
$finalExpress = $this->orderData['dispatch_infos'][$goods['dispatch_id']]['finalExpress']; $finalExpress = $this->orderData['dispatch_infos'][$goods['dispatch_id']]['finalExpress'];
} }

Loading…
Cancel
Save