Wesmiler

app/Services/Common/OrderService.php

@@ -229,6 +229,7 @@ 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;
         $deliveryNo = isset($info['delivery_no']) ? $info['delivery_no'] : '';
         $deliveryCode = isset($info['delivery_code']) ? $info['delivery_code'] : '';
         $mobile = isset($info['receiver_mobile']) ? $info['receiver_mobile'] : '';
@@ -403,6 +404,9 @@ class OrderService extends BaseService
         $id = request()->post('id');
         $deliveryCompany = request()->post('delivery_company', '');
         $deliveryNo = request()->post('delivery_no', '');
+        $deliveryType = request()->post('delivery_type', 1);
+        $deliveryName = request()->post('delivery_name', '');
+        $deliveryMobile = request()->post('delivery_mobile', '');
         $deliveryCode = request()->post('delivery_code', '');
 
         if (!$id) {
@@ -418,15 +422,33 @@ class OrderService extends BaseService
             return ['code' => 1, 'msg' => '订单状态不正确，只有已付款订单可以发货'];
         }
 
-        if (!$deliveryNo) {
-            return ['code' => 1, 'msg' => '请填写快递单号'];
+        if($deliveryType == 2){
+            if (!$deliveryName) {
+                return ['code' => 1, 'msg' => '请填写送货人姓名'];
+            }
+
+            if (!$deliveryMobile) {
+                return ['code' => 1, 'msg' => '请填写送货人手机号'];
+            }
+        }else{
+            if (!$deliveryNo) {
+                return ['code' => 1, 'msg' => '请填写快递单号'];
+            }
+
+            if (!$deliveryCompany) {
+                return ['code' => 1, 'msg' => '请选择快递公司'];
+            }
         }
 
+
         $updateData = [
             'status' => 3, // 已发货
+            'delivery_type' => $deliveryType,
             'delivery_company' => $deliveryCompany,
             'delivery_no' => $deliveryNo,
             'delivery_code' => $deliveryCode,
+            'delivery_name' => $deliveryName,
+            'delivery_mobile' => $deliveryMobile,
             'update_time' => time()
         ];