From cb1b208190ae4d951759cacc89ef5f021bfbd462 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Mon, 17 Nov 2025 10:05:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/crm/controller/CustomerController.php      | 6 ++++++
 app/crmAdmin/controller/CustomerController.php | 6 +++++-
 app/crmAdmin/logic/CustomerLogic.php           | 3 ++-
 app/crmAdmin/service/CustomerService.php       | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

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..959d429 100644
--- a/app/crmAdmin/controller/CustomerController.php
+++ b/app/crmAdmin/controller/CustomerController.php
@@ -144,6 +144,11 @@ class CustomerController extends BaseController
     {
         try {
             $param = $request->all();
+            $scene = $param['scene'] ?? '';
+
+            if($scene != 'force' && empty($param['status_desc'])){
+                return $this->error( '移除原因不能为空');
+            }
             if (empty($param['customer_id'])) {
                 return $this->error('customer_id'.trans('not_null'));
             }
@@ -153,7 +158,6 @@ 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()]);
             } elseif ($scene === 'force') { //强删除
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;

From 6096f7ee01de07c26033a6bd2147bf9a9c4e6c36 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Mon, 17 Nov 2025 14:39:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/crmAdmin/controller/CustomerController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/crmAdmin/controller/CustomerController.php b/app/crmAdmin/controller/CustomerController.php
index 959d429..161c4f7 100644
--- a/app/crmAdmin/controller/CustomerController.php
+++ b/app/crmAdmin/controller/CustomerController.php
@@ -145,6 +145,7 @@ 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( '移除原因不能为空');
@@ -159,11 +160,11 @@ class CustomerController extends BaseController
                 return $this->error( trans('fail'));
             }
             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);