订单自取

app-mall/controllers/OrderController.php

@@ -146,9 +146,9 @@ class OrderController extends BaseController
             $post['discountAmount'] = $discountData['discountAmount'];
 
             //非自取订单考虑配送时间
+            $post['reachDate'] = isset($post['reachDate']) && !empty($post['reachDate']) ? $post['reachDate'] : date("Y-m-d");
             $sendType = $post['sendType'] ?? 0;
             if ($sendType != 1) {
-                $post['reachDate'] = isset($post['reachDate']) && !empty($post['reachDate']) ? $post['reachDate'] : date("Y-m-d");
                 if (isset($post['reachPeriod']) == false || empty($post['reachPeriod'])) {
                     util::fail('请选择配送时间');
                 }

biz-hd/order/classes/OrderClass.php

@@ -115,9 +115,9 @@ class OrderClass extends BaseClass
         $data['fullAddress'] = $address . $floor;
 
         //非自取订单考虑配送时间
+        $data['reachDate'] = isset($data['reachDate']) && !empty($data['reachDate']) ? $data['reachDate'] : date("Y-m-d");
         $sendType = $data['sendType'] ?? 0;
         if ($sendType != 1) {
-            $data['reachDate'] = isset($data['reachDate']) && !empty($data['reachDate']) ? $data['reachDate'] : date("Y-m-d");
             if (isset($data['reachPeriod']) == false || empty($data['reachPeriod'])) {
                 util::fail('请选择配送时间');
             }