Wesmiler

app/Services/Api/OrderService.php

@@ -883,6 +883,7 @@ class OrderService extends BaseService
         $deliveryCode = isset($info['delivery_code']) ? $info['delivery_code'] : '';
         $deliveryName = isset($info['delivery_name']) ? $info['delivery_name'] : '';
         $deliveryMobile = isset($info['delivery_mobile']) ? $info['delivery_mobile'] : '';
+        $deliveryAt = isset($info['delivery_at']) ? $info['delivery_at'] : '';
         $mobile = isset($info['receiver_mobile']) ? $info['receiver_mobile'] : '';
         $receiverArea = isset($info['receiver_area']) && $info['receiver_area']? $info['receiver_area'] : '';
         if (empty($info)) {
@@ -891,7 +892,7 @@ class OrderService extends BaseService
         }
 
         if($deliveryType==2){
-            return ['info'=>['deliveryManName'=>$deliveryName,'deliveryPhone'=>$deliveryMobile,'deliveryManPhone'=>[$deliveryMobile]]];
+            return ['info'=>['deliveryManName'=>$deliveryName,'deliveryPhone'=>$deliveryMobile,'deliveryManPhone'=>[$deliveryMobile]],'arrivalData'=>['arrivalTime'=>$deliveryAt]];
         }
 
         $cacheKey = "caches:kd100:order_{$id}";

app/Services/Common/OrderService.php

@@ -234,6 +234,7 @@ class OrderService extends BaseService
         $deliveryCode = isset($info['delivery_code']) ? $info['delivery_code'] : '';
         $deliveryName = isset($info['delivery_name']) ? $info['delivery_name'] : '';
         $deliveryMobile = isset($info['delivery_mobile']) ? $info['delivery_mobile'] : '';
+        $deliveryAt = isset($info['delivery_at']) ? $info['delivery_at'] : '';
         $mobile = isset($info['receiver_mobile']) ? $info['receiver_mobile'] : '';
         $receiverArea = isset($info['receiver_area']) && $info['receiver_area']? $info['receiver_area'] : '';
         if (empty($info)) {
@@ -242,7 +243,7 @@ class OrderService extends BaseService
         }
 
         if($deliveryType==2){
-            return ['info'=>['deliveryManName'=>$deliveryName,'deliveryPhone'=>$deliveryMobile,'deliveryManPhone'=>[$deliveryMobile]]];
+            return ['info'=>['deliveryManName'=>$deliveryName,'deliveryPhone'=>$deliveryMobile,'deliveryManPhone'=>[$deliveryMobile]],'arrivalData'=>['arrivalTime'=>$deliveryAt]];
         }
 
         $cacheKey = "caches:kd100:order_{$id}";
@@ -413,6 +414,7 @@ class OrderService extends BaseService
         $deliveryType = request()->post('delivery_type', 1);
         $deliveryName = request()->post('delivery_name', '');
         $deliveryMobile = request()->post('delivery_mobile', '');
+        $deliveryAt = request()->post('delivery_at', '');
         $deliveryCode = request()->post('delivery_code', '');
 
         if (!$id) {
@@ -455,6 +457,7 @@ class OrderService extends BaseService
             'delivery_code' => $deliveryCode,
             'delivery_name' => $deliveryName,
             'delivery_mobile' => $deliveryMobile,
+            'delivery_at' => $deliveryAt,
             'update_time' => time()
         ];