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

修改

Browse Source
This commit is contained in:
liaofei 2023-06-19 17:28:03 +08:00
parent e244413f37
commit 1ec1c8aee3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -814,6 +814,9 @@ class StoreOrderController
['data', ''],
]);
\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('验签失败');
}
@ -831,13 +834,13 @@ class StoreOrderController
}
break;
case 'order_take'://取件
if (isset($data['task_id'])) {
$orderInfo = $this->services->get(['task_id' => $data['task_id']]);
if (isset($data['data']['task_id'])) {
$orderInfo = $this->services->get(['kuaidi_task_id' => $data['data']['task_id']]);
if (!$orderInfo) {
return app('json')->fail('订单不存在');
}
$this->services->transaction(function () use ($data, $orderInfo) {
$this->services->update(['task_id' => $data['task_id']], [
$this->services->update(['kuaidi_task_id' => $data['data']['task_id']], [
'status' => 1,
'is_stock_up' => 0
]);

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

@ -2681,7 +2681,7 @@ HTML;
if (!$orderInfo->kuaidi_task_id || !$orderInfo->kuaidi_order_id) {
throw new ValidateException('商家寄件订单信息不存在，无法取消');
}
if ($orderInfo->status != 1) {
if ($orderInfo->is_stock_up != 1) {
throw new ValidateException('订单状态不正确，无法取消寄件');
}