Wesmiler

app/Services/Api/OrderService.php

@@ -878,8 +878,11 @@ class OrderService extends BaseService
     public function getDelivery($id)
     {
         $info = $this->model->where(['id' => $id, 'mark' => 1])->first();
+        $deliveryType = isset($info['delivery_type']) ? $info['delivery_type'] : 1;
         $deliveryNo = isset($info['delivery_no']) ? $info['delivery_no'] : '';
         $deliveryCode = isset($info['delivery_code']) ? $info['delivery_code'] : '';
+        $deliveryName = isset($info['delivery_name']) ? $info['delivery_name'] : '';
+        $deliveryMobile = isset($info['delivery_mobile']) ? $info['delivery_mobile'] : '';
         $mobile = isset($info['receiver_mobile']) ? $info['receiver_mobile'] : '';
         $receiverArea = isset($info['receiver_area']) && $info['receiver_area']? $info['receiver_area'] : '';
         if (empty($info)) {
@@ -887,6 +890,10 @@ class OrderService extends BaseService
             return false;
         }
 
+        if($deliveryType==1){
+            return ['info'=>['deliveryManName'=>$deliveryName,'deliveryPhone'=>$deliveryMobile,'deliveryManPhone'=>[$deliveryMobile]]];
+        }
+
         $cacheKey = "caches:kd100:order_{$id}";
         $data = RedisService::get($cacheKey);
         if ($data) {

app/Services/Common/OrderService.php

@@ -229,9 +229,11 @@ class OrderService extends BaseService
     public function getDelivery($id)
     {
         $info = $this->model->where(['id' => $id, 'mark' => 1])->first();
-        $deliveryType = isset($info['delivery_type']) && $info['delivery_type']? $info['delivery_type'] : 1;
+        $deliveryType = isset($info['delivery_type']) ? $info['delivery_type'] : 1;
         $deliveryNo = isset($info['delivery_no']) ? $info['delivery_no'] : '';
         $deliveryCode = isset($info['delivery_code']) ? $info['delivery_code'] : '';
+        $deliveryName = isset($info['delivery_name']) ? $info['delivery_name'] : '';
+        $deliveryMobile = isset($info['delivery_mobile']) ? $info['delivery_mobile'] : '';
         $mobile = isset($info['receiver_mobile']) ? $info['receiver_mobile'] : '';
         $receiverArea = isset($info['receiver_area']) && $info['receiver_area']? $info['receiver_area'] : '';
         if (empty($info)) {
@@ -239,6 +241,10 @@ class OrderService extends BaseService
             return false;
         }
 
+        if($deliveryType==1){
+            return ['info'=>['deliveryManName'=>$deliveryName,'deliveryPhone'=>$deliveryMobile,'deliveryManPhone'=>[$deliveryMobile]]];
+        }
+
         $cacheKey = "caches:kd100:order_{$id}";
         $data = RedisService::get($cacheKey);
         if ($data) {