1

app/Services/PatientOrderService.php

@@ -1099,18 +1099,6 @@ class PatientOrderService extends BaseService
             return fail();
         }
 
-        // 获取物流数据
-        $params = array();
-        $params['order_product_id'] = $order_product_id;
-        $order_product_logistics = OrderProductLogistic::getOne($params);
-        if (empty($order_product_logistics)){
-            return success(null);
-        }
-
-        $order_product_logistics = $order_product_logistics->toArray();
-
-        $order_product_logistics['logistics_content'] = json_decode($order_product_logistics['logistics_content'],true);
-
         // 地址数据
         $address = array();
         $address['province_id'] = $order_product['province_id'];
@@ -1127,11 +1115,25 @@ class PatientOrderService extends BaseService
         $address['consignee_tel_mask'] = $order_product['consignee_tel_mask'];
 
         $result = array();
-        $result['logistics'] = $order_product_logistics;
+        $result['logistics'] = null;
         $result['address'] = $address;
 
+        // 获取物流数据
+        $params = array();
+        $params['order_product_id'] = $order_product_id;
+        $order_product_logistics = OrderProductLogistic::getOne($params);
+        if (empty($order_product_logistics)){
+            return success($result);
+        }
+
+        $order_product_logistics = $order_product_logistics->toArray();
+
+        $order_product_logistics['logistics_content'] = json_decode($order_product_logistics['logistics_content'],true);
+        $result['logistics'] = $order_product_logistics;
+
         return success($result);
     }
+
     /**
      * 获取处方订单列表
      * @return array