From 6c27d692074eea663bc041b13bdafca243593d63 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 14 Jun 2023 10:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=AE=B6=E5=AF=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/order/StoreOrder.php   | 5 ++++-
 crmeb/app/services/order/StoreOrderDeliveryServices.php | 6 ++++++
 crmeb/crmeb/services/express/storage/Express.php        | 7 ++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
index d0ed1fbe8..da92fb0a2 100644
--- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
+++ b/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);
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 1b723f21c..17f074977 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/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) {
diff --git a/crmeb/crmeb/services/express/storage/Express.php b/crmeb/crmeb/services/express/storage/Express.php
index cd4dc4800..518727179 100644
--- a/crmeb/crmeb/services/express/storage/Express.php
+++ b/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;
     }
 
     /**