diff --git a/app/crm/controller/CustomerController.php b/app/crm/controller/CustomerController.php index 25b186e..13dad20 100644 --- a/app/crm/controller/CustomerController.php +++ b/app/crm/controller/CustomerController.php @@ -435,6 +435,11 @@ class CustomerController extends BaseController { $id = Util::getParam($request, 'id'); $scene = Util::getParam($request, 'scene',''); + $status_desc = Util::getParam($request, 'status_desc',''); + + if($scene == 'force' && empty($status_desc)){ + return $this->error( '移除原因不能为空'); + } $userId = $request->user->uid; $where = [ @@ -450,6 +455,7 @@ class CustomerController extends BaseController if ($scene == 'force') { //status=5:业务员自己删除 $customer->status = 5; + $customer->status_desc = $status_desc; $res = $customer->save(); }else{ $customer->user_id = 0; diff --git a/app/crmAdmin/controller/CustomerController.php b/app/crmAdmin/controller/CustomerController.php index 6104fcd..161c4f7 100644 --- a/app/crmAdmin/controller/CustomerController.php +++ b/app/crmAdmin/controller/CustomerController.php @@ -144,6 +144,12 @@ class CustomerController extends BaseController { try { $param = $request->all(); + $scene = $param['scene'] ?? ''; + $status_desc = $param['status_desc'] ?? ''; + + if($scene != 'force' && empty($param['status_desc'])){ + return $this->error( '移除原因不能为空'); + } if (empty($param['customer_id'])) { return $this->error('customer_id'.trans('not_null')); } @@ -153,13 +159,12 @@ class CustomerController extends BaseController if(!$query->exists()){ return $this->error( trans('fail')); } - $scene = $param['scene'] ?? ''; if ($scene === 'list') { //管理端客户列表移除 - $res = $query->update(['status' => 4, 'deleted_at' => time()]); + $res = $query->update(['status' => 4, 'status_desc' => $status_desc, 'deleted_at' => time()]); } elseif ($scene === 'force') { //强删除 $res = $query->forceDelete(); } else { //公海软删除 - $res = $query->update(['status' => 3, 'deleted_at' => time()]); + $res = $query->update(['status' => 3, 'status_desc' => $status_desc, 'deleted_at' => time()]); } return $this->success($res); diff --git a/app/crmAdmin/logic/CustomerLogic.php b/app/crmAdmin/logic/CustomerLogic.php index 13efe9c..5c4192a 100644 --- a/app/crmAdmin/logic/CustomerLogic.php +++ b/app/crmAdmin/logic/CustomerLogic.php @@ -21,12 +21,13 @@ class CustomerLogic return $res; } - public function forceDelete(int $id) + public function forceDelete(int $id ,string $status_desc = '') { $customer = Customer::withTrashed()->find($id); //强制删除 // $res = $customer->forceDelete(); $customer->status = 3; + $customer->status_desc = $status_desc; $res = $customer->save(); return $res; } diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index 6b5573a..ecd2a17 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -325,7 +325,7 @@ class CustomerService $audit->status = 3; $audit->save(); } - return $logic->forceDelete($params['id']); + return $logic->forceDelete($params['id'],$audit->remark); } else { if(!empty($audit)){ $audit->status = 2;