非自取订单考虑配送时间

biz-hd/order/classes/OrderClass.php

@@ -114,7 +114,15 @@ class OrderClass extends BaseClass
         $floor = $data['floor'] ?? '';
         $data['fullAddress'] = $address . $floor;
 
-        $data['reachDate'] = isset($data['reachDate']) && !empty($data['reachDate']) ? $data['reachDate'] : '0000-00-00';
+        //非自取订单考虑配送时间
+        $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('请选择配送时间');
+            }
+            $data['reachTime'] = strtotime($data['reachDate'] . ' ' . $data['reachPeriod']);
+        }
 
         //将花店每月的总订单数作为编号
         $riseNum = StatOrderCountClass::addOrder($shop, $main);

biz-hd/order/services/OrderService.php

@@ -295,16 +295,6 @@ class OrderService extends BaseService
             $data['onlinePay'] = dict::getDict('onlinePay', 'not');
         }
 
-        //非自取订单考虑配送时间
-        $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('请选择配送时间');
-            }
-            $post['reachTime'] = strtotime($post['reachDate'] . ' ' . $post['reachPeriod']);
-        }
-
         //保存订单
         $returnOrder = OrderClass::addOrder($data);