Merge commit 'ed96e0f8589042fb8e9d6cfee713c5150612bb34'

app/crmAdmin/controller/CustomerController.php

@@ -4,6 +4,7 @@ namespace app\crmAdmin\controller;
 
 use app\common\model\Corp;
 use app\crm\model\Customer;
+use app\crm\utils\Util;
 use app\crmAdmin\service\CustomerService;
 use support\Request;
 
@@ -148,19 +149,18 @@ class CustomerController extends BaseController
             }
 
             $customer_id = explode(',', $param['customer_id']);
-            $customer = Customer::whereIn('id',$customer_id)->withTrashed()->first();
-            if(empty($customer)){
+            $query = Customer::whereIn('id',$customer_id)->withTrashed();
+            if(!$query->exists()){
                 return $this->error( trans('fail'));
             }
-            if($param['scene'] == 'list'){ //管理端客户列表移除
-                $customer->status = 4;
-
-            }else{ //公海软删除
-                $customer->status = 3;
-
+            $scene = $param['scene'] ?? '';
+            if ($scene === 'list') { //管理端客户列表移除
+                $res = $query->update(['status' => 4, 'deleted_at' => time()]);
+            } elseif ($scene === 'force') { //强删除
+                $res = $query->forceDelete();
+            } else { //公海软删除
+                $res = $query->update(['status' => 3, 'deleted_at' => time()]);
             }
-            $res = $customer->save();
-            $customer->delete();
 
             return $this->success($res);
         } catch (\Throwable $th) {
@@ -168,6 +168,34 @@ class CustomerController extends BaseController
         }
     }
 
+
+    /**
+     * 客户恢复
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function restore(Request $request)
+    {
+        try {
+            $id = $request->input('id', '');
+            if (Util::isEmpty($id)) {
+                return $this->error(trans('id_empty'));
+            }
+            $ids = explode(',', $id);
+            $query = Customer::withTrashed()->whereIn('id', $ids);
+            if (!$query->exists()) {
+                return $this->error(trans('fail'));
+            }
+            // 恢复软删除（清空 deleted_at）
+            $query->restore();
+            // 恢复为在库状态，放入公海
+            $res = Customer::whereIn('id', $ids)->update(['status' => 1, 'user_id' => 0]);
+            return $this->success($res, trans('success'));
+        } catch (\Throwable $th) {
+            return $this->error($th->getMessage());
+        }
+    }
+
     /**
      * 客户详情
      * @param Request $request

app/crmAdmin/service/CustomerService.php

@@ -51,12 +51,14 @@ class CustomerService
         $follow_last = $params['follow_last'] ?? '';
         $tagId = $params['tag_id'] ?? [];
         $user_id = $params['user_id'] ?? '';
-        $seas = $params['seas'] ?? '';
+        $seas = $params['seas'] ?? ''; //recyclea:管理端回收站，audit:待审核列表，seas:公海
         $scene = $params['scene'] ?? '';
         $where = [];
 
         if ($scene == 'audit') {
             $where[] = ['status', '=', 2];
+        } elseif ($scene == 'recyclea') {
+            $where[] = ['status', '>', 2];
         } else {
             $where[] = ['status', '=', 1];
         }
@@ -121,8 +123,8 @@ class CustomerService
         if ($recycle == 'recycle' || $scene == 'recycle' || $scene == 'audit') {
             $query->onlyTrashed();
         }
-        if ($seas == 'seas' || $scene == 'seas') {
-            $query->withTrashed();
+        if ($seas == 'seas' || $scene == 'recyclea') {
+            $query = $query->withTrashed();
         }
 
         if (!$export) {
@@ -153,6 +155,14 @@ class CustomerService
                     }
                     $item['audit'] = $audit;
                 }
+                if ($scene == 'recyclea' && $item['status'] == 3) { //回收站删除来源
+                    $item['del_source'] = '公海';
+                }elseif ($scene == 'recyclea' && $item['status'] == 4) {
+                    $item['del_source'] = '管理端';
+                }elseif ($scene == 'recyclea' && $item['status'] == 5) {
+                    $source = (!empty($item['user_id'])) ? ('：' . User::where('id',$item['user_id'])->value('name')) : '';
+                    $item['del_source'] = '业务员' . $source;
+                }
             }
         }
         unset($item);