update: 代码美化

app-ghs/controllers/OrderController.php

@@ -1111,7 +1111,6 @@ class OrderController extends BaseController
         $transType = $post['transType'] ?? 0;
 
         $shop = $this->shop;
-
         //过期不支持开单
         $deadline = $shop->deadline;
         $deadTime = strtotime($deadline);
@@ -1359,8 +1358,7 @@ class OrderController extends BaseController
                 }
 
                 //跑腿订单生产者创建订单
-                // TODO
-                if ($order->payStatus == 1 && $sendType == dict::getDict('sendType', 'thirdSend') && $post['callErrand'] == 1) { // $post 中有 pickupTime，则说明是要立即发跑腿 或者  callErrand == 1
+                if ($order->payStatus == 1 && $sendType == dict::getDict('sendType', 'thirdSend') && $post['callErrand'] == 1) { // $post 中有 pickupTime，则说明是要立即发跑腿 或者 callErrand == 1
                     $platform = $post['deliveryPlatform'];
                     $deliveryPrice = $post['deliveryPrice'];
                     $deliveryDistance = $post['deliveryDistance'];

app-hd/controllers/OrderController.php

@@ -589,7 +589,7 @@ class OrderController extends BaseController
         $post['staffName'] = $this->shopAdmin->name ?? '';
         $post['flowerNum'] = isset($post['flowerNum']) && $post['flowerNum'] > 0 ? $post['flowerNum'] : 0;
 
-        $version = $post['version'] ?? 0;
+        $version = $post['version'] ?? 0; //验证已移至 CreateOrderForm
 
         //默认情况开单员工和收款员工是同个人
         $staffId = $this->shopAdminId ?? 0;
@@ -812,9 +812,9 @@ class OrderController extends BaseController
                 ShopExtClass::newWorkRemind($shopExt, $order);
             }
 
-            //跑腿订单生产者创建订单 // TODO
+            //跑腿订单生产者创建订单
             $sendType = $post['sendType'] ?? 0;
-            if($order->payStatus == 1 && $sendType == dict::getDict('sendType', 'thirdSend') && $post['callErrand'] == 1){ // $post 中有 pickupTime，则说明是要立即发跑腿
+            if($order->payStatus == 1 && $sendType == dict::getDict('sendType', 'thirdSend') && $post['callErrand'] == 1){ // $post 中有 pickupTime，则说明是要立即发跑腿 或者 callErrand == 1
                 $platform = $post['deliveryPlatform'];
                 $deliveryPrice = $post['deliveryPrice'];
                 $deliveryDistance = $post['deliveryDistance'];
@@ -833,7 +833,7 @@ class OrderController extends BaseController
                     'pickupTime' => $pickupTime,
                     'allParams' => $allParams,
                     //-----------------------
-                    'weight' => $post['weight'] ?? 1, // TODO
+                    'weight' => $post['weight'] ?? 1,
                     'remark' => $post['deliveryRemark'] ?? '',
                     'price' => $order->actPrice,
                 ];
@@ -843,7 +843,7 @@ class OrderController extends BaseController
             util::success($return);
         } catch (\Exception $e) {
             $transaction->rollBack();
-            Yii::error("失败原因：" . $e->getMessage());
+            Yii::error("下单失败原因：" . $e->getMessage());
             util::fail('下单失败');
         }
     }