Merge branch 'develop'

app/crm/controller/CustomerController.php

@@ -325,6 +325,7 @@ class CustomerController extends BaseController
             'lng' => Util::getParam($request, 'lng', 0),
             'address' => Util::getParam($request, 'address', ''),
             'sex' => Util::getParam($request, 'sex', 0),
+            'obtain' => time(),
         ];
 
         if (Util::isEmpty($id)) {
@@ -393,13 +394,31 @@ class CustomerController extends BaseController
         if(empty($customer)){
             return $this->error( trans('fail'));
         }
-        if($force == 'force'){
-            //强制删除
-            $res = $customer->forceDelete();
-        }else{
-            //软删除
-            $res = $customer->delete();
+        try {
+            Db::beginTransaction();
+            if ($force == 'force') {
+                //强制删除
+                $res = $customer->forceDelete();
+            } else {
+                $customer->user_id = 0;
+                $customer->save();
+
+                //记录客户关系变化
+                $his = CustomerHis::create([
+                    'customer_id' => $id,
+                    'user_his' => $userId,
+                    'user_id' => 0,
+                ]);
+
+                //软删除
+                $res = $customer->delete();
+            }
+            Db::commit();
+        } catch (\Throwable $e) {
+            Db::rollback();
+            return $this->error($e->getMessage());
         }
+
         if ($res) {
             return $this->success($res, trans('success'));
         } else {
@@ -485,10 +504,10 @@ class CustomerController extends BaseController
             return $this->error(trans('customer_id').trans('not_null'));
         }
         $data = [
-            'user_id' => $request->user->uid
+            'user_id' => $request->user->uid,
+            'obtain' => time(),
         ];
 
-
         try {
             Db::beginTransaction();
             $customer= Customer::withTrashed()->find($customerId);
@@ -526,8 +545,6 @@ class CustomerController extends BaseController
         }
     }
 
-
-
     /**
      * 批量转让
      * @param Request $request
@@ -543,10 +560,11 @@ class CustomerController extends BaseController
             return $this->error( trans('user_none'));
         }
 
-        $query= Customer::whereIn('id',explode(',',$customerId));
+        $query= Customer::withTrashed()->whereIn('id',explode(',',$customerId));
         try {
             $customer = $query->get();
 
+            Db::beginTransaction();
             foreach ($customer as $item) {
                 //记录客户关系变化
                 $his = CustomerHis::create([
@@ -561,8 +579,15 @@ class CustomerController extends BaseController
                         $inquiryLog->save();
                     }
                 }
+
+                $item->restore();
             }
-            $res = $query->update(['user_id' => $user->id]);
+
+            $data = [
+                'user_id' => $user->id,
+                'obtain' => time(),
+            ];
+            $res = $query->update($data);
 
             Db::commit();
         } catch (\Throwable $e) {