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

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

Browse Source
This commit is contained in:
From-wh 2023-06-19 18:26:21 +08:00
commit b718e17987
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/services/order/StoreOrderDeliveryServices.php
View File

@ -577,6 +577,7 @@ class StoreOrderDeliveryServices extends BaseServices
// throw new AdminException('商家寄件未开启无法寄件');
// }
$dump = $expressService->express()->shippmentCreateOrder($expData, sys_config('yihaotong_send_appid', ''));
Log::error('商家寄件返回数据：' . json_encode($dump));
$orderInfo->delivery_id = $dump['kuaidinum'] ?? '';
$data['express_dump'] = json_encode([
'com' => $expData['kuaidicom'],
@ -624,6 +625,7 @@ class StoreOrderDeliveryServices extends BaseServices
'kuaidi_label' => $data['kuaidi_label'],
'kuaidi_task_id' => $data['kuaidi_task_id'],
'kuaidi_order_id' => $data['kuaidi_order_id'],
'express_dump' => $data['express_dump']
];
/** @var StoreOrderStatusServices $services */

9
crmeb/crmeb/services/HttpService.php
View File

@ -88,8 +88,13 @@ class HttpService
$method = strtoupper($method);
//请求方式
curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
//post请求
if ($method == 'POST') curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
//携带参数
if ($method == 'POST') {
curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
} elseif ($method == 'GET' && count($data)) {
$url .= '?' . http_build_query($data);
curl_setopt($curl, CURLOPT_URL, $url);
}
//超时时间
curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
//设置header头

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

@ -30,7 +30,7 @@ class Express extends BaseExpress
/**
* 电子面单模版
*/
const EXPRESS_TEMP = 'v2/expr/temp';
const EXPRESS_TEMP = 'v2/expr_dump/temp';
/**
* 快递公司