Merge branch 'develop'

This commit is contained in:
mzl
2025-09-16 10:53:57 +08:00
parent b399f85707
commit 62c32d25ff
210 changed files with 15388 additions and 95 deletions
+22 -7
View File
@@ -205,6 +205,25 @@ class CustomerController extends BaseController
}
}
/**
* 客户下拉
* @param Request $request
* @return \support\Response
*/
public function preset(Request $request)
{
try {
$param = $request->all();
$param['user_id'] = $request->user->uid;
$param['corp_abbr'] = $request->basic_data['corp_abbr'];
$result = (new CustomerService())->preset($param);
return $this->success($result);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
/**
* 客户恢复
* @param Request $request
@@ -295,14 +314,10 @@ class CustomerController extends BaseController
if (Util::isEmpty($channel_id)) {
return $this->error(trans('channel_not_null'));
}
$country_id = Util::getParam($request, 'country_id', 0);
if (Util::isEmpty($country_id)) {
// return $this->error('country_id'.trans('not_null'));
$country_id = Util::getParam($request, 'country_id', 245);
if(empty($country_id)){
$country_id = 245;
}
// $car_type_id = Util::getParam($request, 'car_type_id');
// if (Util::isEmpty($car_type_id)) {
// return $this->error(trans('car_type_not_null'));
// }
$contacts = Util::getParam($request, 'contacts');
$email = Util::getParam($request, 'email');
$phone = Util::getParam($request, 'phone');