hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #223: (feature/hant -> develop)

Browse Source 
Merge Request: 异常问题

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/223?initial=true
This commit is contained in:
todayswind 2025-07-12 11:23:00 +08:00 committed by Coding
commit 20a157adae
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/admin/controller/Order.php
View File

@ -642,8 +642,8 @@ class Order extends Backend
'update_time' => now()->format('Y-m-d H:m:s'), 'update_time' => now()->format('Y-m-d H:m:s'),
]; ];
$orderDispatch = OrderDispatch::where('order_id', $order->id)->whereBetween('status', '>=', 0)->find(); $orderDispatch = OrderDispatch::where('order_id', $order->id)
->where('status', '>=', 0)->find();
if ($params['abnormal_id'] == 2 || $params['abnormal_id'] == 3) { if ($params['abnormal_id'] == 2 || $params['abnormal_id'] == 3) {
$order->status = \app\admin\model\Order::STATUS_CANCEL; $order->status = \app\admin\model\Order::STATUS_CANCEL;
@ -696,6 +696,7 @@ class Order extends Backend
$result = \model('order_abnormal')->insert($insert); $result = \model('order_abnormal')->insert($insert);
Db::commit(); Db::commit();
} catch (ValidateException|PDOException|Exception $e) { } catch (ValidateException|PDOException|Exception $e) {
throw $e;
Db::rollback(); Db::rollback();
$this->error($e->getMessage()); $this->error($e->getMessage());
} }