From b58aa67664a7ea47540414d7756c81f3cf6f14c2 Mon Sep 17 00:00:00 2001
From: ztt <835303992@qq.com>
Date: Mon, 18 Mar 2024 23:58:49 +0800
Subject: [PATCH] 1

---
 addons/shopro/service/order/OrderCreate.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/shopro/service/order/OrderCreate.php b/addons/shopro/service/order/OrderCreate.php
index 6ca0b28..06d4bdc 100755
--- a/addons/shopro/service/order/OrderCreate.php
+++ b/addons/shopro/service/order/OrderCreate.php
@@ -347,7 +347,7 @@ class OrderCreate
 
             // 获取快递配送数据
 //            if ($buyInfo['dispatch_type'] == 'express'
-            if (in_array('express', $buyInfo['dispatch_type'])
+            if ($this->dispatch_type == 'express'
                 && (!$this->activity['activity']            // 没有活动
                     || (
                         $this->activity['activity']             // 有活动，并且（没有是否包邮字段，或者是不包邮）
@@ -357,7 +357,8 @@ class OrderCreate
             ) {
                 if ($this->userAddress) {
                     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 {
                         $finalExpress = $this->orderData['dispatch_infos'][$goods['dispatch_id']]['finalExpress'];
                     }