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 75ad3aaa0..3af5862f5 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 '消费赚取积分',