github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 22:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

Browse Source
This commit is contained in:
From-wh 2023-05-11 15:47:17 +08:00
commit b4e0c7476b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crmeb/crmeb/services/AccessTokenServeService.php
View File

@ -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);

2
crmeb/crmeb/services/express/storage/Express.php
View File

@ -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']);
}
}

3
crmeb/public/install/crmeb.sql
View File

@ -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 '消费赚取积分',