diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 8f47fd9..c46de6f 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -382,7 +382,7 @@ class Order extends Backend //日志 $hookParams = [ 'dispatch' => $orderDispatch, - 'remark' => '', + 'remark' => '自动派单,操作人:'.$this->auth->nickname, ]; Hook::listen('order_dispatch_change', $hookParams); @@ -482,7 +482,7 @@ class Order extends Backend if(!empty($order->dispatch)){ $orderLogic = new OrderLogic(); - $orderLogic->cancelOrderDispatch($order->dispatch,$this->auth,$params['remark']??'后台取消',false); + $orderLogic->cancelOrderDispatch($order->dispatch,$this->auth,'后台取消订单,操作人'.$this->auth->nickname,false); } //日志 diff --git a/application/admin/controller/orders/Dispatch.php b/application/admin/controller/orders/Dispatch.php index 9792d0f..6e94dac 100644 --- a/application/admin/controller/orders/Dispatch.php +++ b/application/admin/controller/orders/Dispatch.php @@ -165,7 +165,7 @@ class Dispatch extends Backend //dispatch log $hookParams2 = [ 'dispatch' => $this->model->get($this->model->id), - 'remark' => '', + 'remark' => '手动派单,操作人:'.$this->auth->nickname, ]; Hook::listen('order_dispatch_change', $hookParams2); diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php index 8f8ac64..f61f883 100644 --- a/application/admin/controller/orders/Dispatch2.php +++ b/application/admin/controller/orders/Dispatch2.php @@ -247,7 +247,7 @@ class Dispatch2 extends Backend //修改订单状态 $OrderLogic = new OrderLogic(); - $OrderLogic -> dispachFinishAfter($row,['role'=>1,'auth'=>$this->auth,'remark'=>'后台操作,adminId:'.$this->auth->id]); + $OrderLogic -> dispachFinishAfter($row,['role'=>1,'auth'=>$this->auth,'remark'=>'后台操作完成任务,操作人:'.$this->auth->nickname]); Db::commit(); } catch (ValidateException | PDOException | Exception $e) { Db::rollback(); @@ -378,7 +378,12 @@ class Dispatch2 extends Backend ]; Hook::listen('order_dispatch_change', $hookParams);*/ - $OrderLogic->cancelOrderDispatch($item,$this->auth,$remark); + $remark2='操作人:'.$this->auth->nickname; + if(!empty($remark)){ + $remark2 .= ',说明:'.$remark; + } + + $OrderLogic->cancelOrderDispatch($item,$this->auth,$remark2); } Db::commit(); } catch (PDOException | Exception $e) {