Переглянути джерело

顺丰的专送与非专送是只能有一个存在的

shizhongqi 7 місяців тому
батько
коміт
7817001902

+ 4 - 5
common/components/delivery/services/DispatchService.php

@@ -309,16 +309,15 @@ class DispatchService
                 $adapter = $this->adapters['shunfeng'];
                 // is_person_direct -- 店铺是否支持专人直送,0不支持 1支持 2只能发独享专送
                 $isPersonDirect = $adapter->getIsPersonDirect();
-                if($isPersonDirect != 2){
-                    //$customSettings = $this->adapters['shunfeng']->getCustomSettings();
-                    $customSettings = [];//自定义用户设置:默认不专人直送
-                    $preparedData['shunfeng'] = $this->prepareShunfengData($order, $shop, $customSettings);
-                }
 
                 //添加专人直送的订单数据
                 if(in_array($isPersonDirect, [1, 2])){
                     $customSettings = ['isPersonDirect' => 1];//自定义用户设置:专人直送
                     $preparedData['shunfeng_1v1'] = $this->prepareShunfengData($order, $shop, $customSettings);
+                }else{
+                    //$customSettings = $this->adapters['shunfeng']->getCustomSettings();
+                    $customSettings = [];//自定义用户设置:默认不专人直送
+                    $preparedData['shunfeng'] = $this->prepareShunfengData($order, $shop, $customSettings);
                 }
             } catch (\Exception $e) {
                 Yii::warning("Shunfeng 数据准备失败: {$e->getMessage()}");