更新商家寄件功能

crmeb/app/adminapi/controller/v1/order/StoreOrder.php

@@ -286,7 +286,10 @@ class StoreOrder extends AuthController
 
             ['fictitious_content', ''],//虚拟发货内容
 
-            ['cart_ids', []]
+            ['cart_ids', []],
+
+            ['day_type', 0], //顺丰传 0今天，1明天，2后台
+            ['pickup_time', []],//开始时间 9:00，结束时间 10:00  开始时间和结束时间之间不能小于一个小时
         ]);
         if (!$id) {
             return app('json')->fail(100100);

crmeb/app/services/order/StoreOrderDeliveryServices.php

@@ -440,6 +440,12 @@ class StoreOrderDeliveryServices extends BaseServices
         /** @var StoreOrderCartInfoServices $orderInfoServices */
         $orderInfoServices = app()->make(StoreOrderCartInfoServices::class);
         $storeName = $orderInfoServices->getCarIdByProductTitle((int)$orderInfo->id);
+
+        if (count($data['pickup_time']) == 2) {
+            $data['pickup_start_time'] = $data['pickup_time'][0];
+            $data['pickup_end_time'] = $data['pickup_time'][1];
+        }
+
         // 发货信息录入
         $res = [];
         switch ($type) {

crmeb/crmeb/services/express/storage/Express.php

@@ -74,7 +74,12 @@ class Express extends BaseExpress
      */
     public function getKuaidiComs()
     {
-        return $this->accessToken->httpRequest(self::SHIPMENT_KUAIDI_NUMS, [], 'GET');
+        $list = $this->accessToken->httpRequest(self::SHIPMENT_KUAIDI_NUMS, [], 'GET');
+        foreach ($list as &$item) {
+            $item['code'] = $item['value'];
+            $item['value'] = $item['label'];
+        }
+        return $list;
     }
 
     /**