From 74f69f8cbf5ac57b1799ab01baeca5fcc38d813f Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 11 May 2023 15:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=B5=E5=AD=90=E9=9D=A2?=
 =?UTF-8?q?=E5=8D=95=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/AccessTokenServeService.php | 5 ++---
 crmeb/crmeb/services/express/storage/Express.php | 2 +-
 crmeb/public/install/crmeb.sql                   | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crmeb/crmeb/services/AccessTokenServeService.php b/crmeb/crmeb/services/AccessTokenServeService.php
index 489e5d2f1..92bb48cb2 100644
--- a/crmeb/crmeb/services/AccessTokenServeService.php
+++ b/crmeb/crmeb/services/AccessTokenServeService.php
@@ -146,15 +146,14 @@ class AccessTokenServeService extends HttpService
      * @param bool $isHeader
      * @return array|mixed
      */
-    public function httpRequest(string $url, array $data = [], string $method = 'POST', bool $isHeader = true)
+    public function httpRequest(string $url, array $data = [], string $method = 'POST', bool $isHeader = true, array $header = [])
     {
-        $header = [];
         if ($isHeader) {
             $this->getToken();
             if (!$this->accessToken) {
                 throw new ApiException(410086);
             }
-            $header = ['Authorization:Bearer-' . $this->accessToken];
+            $header = array_merge($header, ['Authorization:Bearer-' . $this->accessToken]);
         }
 
         $res = $this->request($this->get($url), $method, $data, $header);
diff --git a/crmeb/crmeb/services/express/storage/Express.php b/crmeb/crmeb/services/express/storage/Express.php
index 85393992f..a0132b904 100644
--- a/crmeb/crmeb/services/express/storage/Express.php
+++ b/crmeb/crmeb/services/express/storage/Express.php
@@ -168,7 +168,7 @@ class Express extends BaseExpress
         if (!$data['siid']) {
             $param['print_type'] = 'IMAGE';
         }
-        return $this->accessToken->httpRequest(self::EXPRESS_DUMP, $param, 'POST');
+        return $this->accessToken->httpRequest(self::EXPRESS_DUMP, $param, 'POST', true, ['version:v1.1']);
     }
 
 }
diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql
index 792b257fc..9f74955cc 100755
--- a/crmeb/public/install/crmeb.sql
+++ b/crmeb/public/install/crmeb.sql
@@ -28223,6 +28223,9 @@ CREATE TABLE IF NOT EXISTS `eb_store_order` (
   `delivery_code` varchar(50) NOT NULL DEFAULT '' COMMENT '快递公司编码',
   `delivery_type` varchar(32) NOT NULL DEFAULT '' COMMENT '发货类型',
   `delivery_id` varchar(64) NOT NULL DEFAULT '' COMMENT '快递单号/手机号',
+  `kuaidi_label` varchar(255) NOT NULL DEFAULT '' COMMENT '快递单号图片',
+  `kuaidi_task_id` varchar(64) NOT NULL DEFAULT '' COMMENT '快递单任务id',
+  `kuaidi_order_id` varchar(64) NOT NULL DEFAULT '' COMMENT '快递单订单号',
   `fictitious_content` varchar(500) NOT NULL DEFAULT '' COMMENT '虚拟发货内容',
   `delivery_uid` int(11) NOT NULL DEFAULT '0' COMMENT '配送员id',
   `gain_integral` decimal(8,2) UNSIGNED NOT NULL DEFAULT '0.00' COMMENT '消费赚取积分',