xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source 
# Conflicts:
#	.gitignore
#	composer.lock
This commit is contained in:
mzl
2025-12-02 14:17:25 +08:00
parent d53f18181a
commit 32a7752f8b
21 changed files with 838 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/crmAdmin/controller/CustomerController.php
+8 -3
View File
@@ -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);