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

完成订单重构

Browse Source
This commit is contained in:
xman 2025-06-02 14:08:34 +08:00
parent 5a6642ea1f
commit b6cc5c5cc6
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,7 +396,7 @@ class Order extends Backend
//日志 //日志
$hookParams = [ $hookParams = [
'dispatch' => (new OrderDispatch())->where('id', $res)->find(), 'dispatch' => (new OrderDispatch())->where('id', $res)->find(),
'remark' => '系统自动派单', 'remark' => '系统自动派单给师傅:'. $worker->name .'('.$worker->tel.')',
]; ];
Hook::listen('order_dispatch_change', $hookParams); Hook::listen('order_dispatch_change', $hookParams);

3
application/admin/controller/orders/Dispatch.php
View File

@ -175,7 +175,7 @@ class Dispatch extends Backend
//dispatch log //dispatch log
$hookParams2 = [ $hookParams2 = [
'dispatch' => $dispatch, 'dispatch' => $dispatch,
'remark' => '手动派单', 'remark' => '手动派单给师傅：' . $worker->name .'('.$worker->tel.')',
]; ];
Hook::listen('order_dispatch_change', $hookParams2); Hook::listen('order_dispatch_change', $hookParams2);
@ -291,7 +291,6 @@ class Dispatch extends Backend
Db::commit(); Db::commit();
} catch (PDOException | Exception $e) { } catch (PDOException | Exception $e) {
Db::rollback(); Db::rollback();
throw $e;
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
/* if ($count) { /* if ($count) {

3
application/admin/controller/orders/Dispatch2.php
View File

@ -204,7 +204,6 @@ class Dispatch2 extends Backend
//记录日志 //记录日志
$remark = '师傅由 ('.$row->worker_id.')'.$row->worker_name.' 更换为('.$params['worker_id'].')'.$worker->name; $remark = '师傅由 ('.$row->worker_id.')'.$row->worker_name.' 更换为('.$params['worker_id'].')'.$worker->name;
$workerChange = true; $workerChange = true;
} }
$result = $row->allowField(true)->save($params); $result = $row->allowField(true)->save($params);
@ -331,7 +330,7 @@ class Dispatch2 extends Backend
//修改订单状态 //修改订单状态
$OrderLogic = new OrderLogic(); $OrderLogic = new OrderLogic();
$OrderLogic -> dispachFinishAfter($row,['role'=>1,'auth'=>$this->auth,'remark'=>'后台完成任务，操作人:'.$this->auth->nickname],true); $OrderLogic -> dispachFinishAfter($row,['role'=>1,'auth'=>$this->auth,'remark'=>'后台完成任务'],true);
Db::commit(); Db::commit();
} catch (ValidateException | PDOException | Exception $e) { } catch (ValidateException | PDOException | Exception $e) {
Db::rollback(); Db::rollback();