Jelajahi Sumber

跑腿车型,传递了spec_req会出现核价失败--调整

shizhongqi 2 bulan lalu
induk
melakukan
c69e9cc48e

+ 9 - 4
common/components/delivery/services/adapter/HuolalaAdapter.php

@@ -102,7 +102,7 @@ class HuolalaAdapter extends Huolala implements Adapter
             'order_vehicle_id' => $params['order_vehicle_id'],
             'addr_info' => $addrInfo,
             'vehicle_std' => $params['vehicle_std'] ?? [],
-            //'spec_req' => $params['spec_req'], // 跑腿车型,传这个值会出现"核价失败"
+            'spec_req' => $params['spec_req'],
             'order_time' => (int)$orderTime,
             'contact_name' => $shop['merchantName'],
             'contact_phone_no' => $shop['mobile'],
@@ -124,6 +124,11 @@ class HuolalaAdapter extends Huolala implements Adapter
         // 添加订单消息回调地址
         $apiData['notify_url'] = $this->notifyUrl;
 
+        // 跑腿车型,传这个值会出现"核价失败",所以要去除
+        if ($params['type'] == '跑腿') {
+            unset($apiData['spec_req']);
+        }
+
         return $apiData;
     }
 
@@ -179,7 +184,7 @@ class HuolalaAdapter extends Huolala implements Adapter
             $apiData['vehicle_std'] = is_array($order['vehicle_std']) ? $order['vehicle_std'] : [$order['vehicle_std']];
         }
         if (!empty($order['spec_req']) && is_array($order['spec_req'])) {
-            //$apiData['spec_req'] = array_map('intval', $order['spec_req']); // 跑腿车型,传这个值会出现"核价失败"
+            $apiData['spec_req'] = array_map('intval', $order['spec_req']);
         }
         if (!empty($order['remark'])) {
             $apiData['remark'] = $order['remark'];
@@ -194,7 +199,7 @@ class HuolalaAdapter extends Huolala implements Adapter
             $apiData['notify_url'] = $order['notify_url'];
         }
         if (isset($order['coupon_id'])) {
-            $apiData['coupon_id'] = $order['coupon_id'];
+            $apiData['coupon_id'] = intval($order['coupon_id']);
         }
         if (isset($order['invoice_type'])) {
             $apiData['invoice_type'] = (int)$order['invoice_type'];
@@ -378,7 +383,7 @@ class HuolalaAdapter extends Huolala implements Adapter
                 $apiData['vehicle_std'] = is_array($vehicle['vehicle_std']) ? $vehicle['vehicle_std'] : [$vehicle['vehicle_std']];
             }
             if (!empty($vehicle['spec_req'])) {
-                //$apiData['spec_req'] = is_array($vehicle['spec_req']) ? $vehicle['spec_req'] : [$vehicle['spec_req']]; // 跑腿车型,传这个值会出现"核价失败" -- 统一不传试试
+                $apiData['spec_req'] = is_array($vehicle['spec_req']) ? $vehicle['spec_req'] : [$vehicle['spec_req']];
             }
             if (isset($vehicle['coupon_id']) && !empty($vehicle['coupon_id'])) {
                 $apiData['coupon_id'] = $vehicle['coupon_id'];