Merge branch 'zhongqi-IntraCityExpress' of git.huaml.com:zhh/huahuibao into zhongqi-IntraCityExpress

app-mall/controllers/OrderController.php

@@ -407,7 +407,7 @@ class OrderController extends BaseController
             $sendType = $post['sendType'] ?? 0;
             if ($sendType != 1) {
                 if (empty($post['reachPeriod'])) {
-                    util::fail('请选择配送时间');
+                    util::fail('请选择配送时间哈');
                 }
                 $post['reachTime'] = strtotime($post['reachDate'] . ' ' . $post['reachPeriod']);
             }

biz-hd/order/classes/OrderClass.php

@@ -57,10 +57,10 @@ class OrderClass extends BaseClass
     //待付款
     const ORDER_STATUS_UN_PAY = 1;
 
-    const SEND_STATUS_UNSEND    = 0; //未发货
-    const SEND_STATUS_SENDING   = 1; //已发货（配送中）
+    const SEND_STATUS_UNSEND = 0; //未发货
+    const SEND_STATUS_SENDING = 1; //已发货（配送中）
     const SEND_STATUS_COMPLETED = 2; //已送达
-    const SEND_STATUS_CANCEL    = 3; //取消
+    const SEND_STATUS_CANCEL = 3; //取消
 
     //订单总流程数
     const ORDER_TOTAL_FLOW = 4;
@@ -263,16 +263,18 @@ class OrderClass extends BaseClass
 
         $address = $data['address'] ?? '';
         $floor = $data['floor'] ?? '';
-        if (isset($data['fullAddress']) == false || empty($data['fullAddress'])) {
+        if (empty($data['fullAddress'])) {
             $data['fullAddress'] = $address . $floor;
         }
 
         //非自取订单考虑配送时间
-        $data['reachDate'] = isset($data['reachDate']) && !empty($data['reachDate']) ? $data['reachDate'] : date("Y-m-d");
+        $data['reachDate'] = !empty($data['reachDate']) ? $data['reachDate'] : date("Y-m-d");
         $sendType = $data['sendType'] ?? 0;
-        if ($sendType != 1) {
-            if (isset($data['reachPeriod']) == false || empty($data['reachPeriod'])) {
-                util::fail('请选择配送时间');
+        $fromType = $data['fromType'] ?? 0;
+        //如果不是门店来的订单，则必须填写配送时间
+        if ($sendType != 1 && $fromType != 1) {
+            if (empty($data['reachPeriod'])) {
+                util::fail('请选择配送时间呢');
             }
             $data['reachTime'] = strtotime($data['reachDate'] . ' ' . $data['reachPeriod']);
         }

common/components/dict.php

@@ -522,7 +522,7 @@ class dict
         'fromType' => [
             'shop' => 1,//门店
             'mall' => 2,//商城
-            'friend' => 3,//微信客服号
+            'friend' => 3,//微信朋友圈
             'mt' => 4,//美团
             'elm' => 5,//饿了么
         ],