fix two bug

app-ghs/controllers/OrderController.php

@@ -161,7 +161,7 @@ class OrderController extends BaseController
         if ($order->status == 5) {
             util::fail('订单已取消');
         }
-        if ($order->sendStatus != -4){
+        if (!in_array($order->sendStatus, [-1, -4])){
             util::fail('已使用跑腿配送');
         }
         $connection = Yii::$app->db;

common/components/delivery/services/adapter/FengniaoAdapter.php

@@ -124,7 +124,7 @@ class FengniaoAdapter extends Fengniao implements Adapter
             'serial_number' => $order['sendNum'] // 配送编号，方便寻找订单对应的花材
         ];
         if($orderType == 3) {
-            $orderData['require_receive_time'] = strtotime($params['order_time']) * 1000;
+            $orderData['require_receive_time'] = strtotime($params['pickupTime']) * 1000;
         }
 
         return $orderData;