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 17:57:04 +08:00
commit c4568b91e8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/api/controller/v1/order/StoreOrderController.php
View File

@ -815,7 +815,7 @@ class StoreOrderController
]);
\think\facade\Log::error('回调:' . json_encode($data));
$data['data']['id'] = (int)$data['data']['id'];
if (md5(json_encode($data['data']) . $data['t']) != $data['sign']) {
return app('json')->fail('验签失败');

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

@ -621,6 +621,9 @@ class StoreOrderDeliveryServices extends BaseServices
'is_stock_up' => 1,
'delivery_type' => $data['delivery_type'],
'delivery_name' => $data['delivery_name'],
'kuaidi_label' => $data['kuaidi_label'],
'kuaidi_task_id' => $data['kuaidi_task_id'],
'kuaidi_order_id' => $data['kuaidi_order_id'],
];
/** @var StoreOrderStatusServices $services */