Merge branch 'develop'

2025-08-14 20:08:57 +08:00
parent f4a2966b1e
commit 39e840bba8
49 changed files with 2240 additions and 522 deletions
@@ -13,6 +13,10 @@ class CustomerLogic
        $customer->status = $status;
        $res = $customer->save();

+        if($status == 1){
+            $customer->restore();
+        }
+
        return $res;
    }

@@ -20,7 +24,9 @@ class CustomerLogic
    {
        $customer = Customer::withTrashed()->find($id);
        //强制删除
-        $res = $customer->forceDelete();
+//        $res = $customer->forceDelete();
+        $customer->status = 3;
+        $res = $customer->save();
        return $res;
    }
 }