|
|
|
|
@ -167,6 +167,7 @@ class UserController extends CommonController
|
|
|
|
|
{
|
|
|
|
|
$all = \request()->except(['id', 'mobile', 'openid']);
|
|
|
|
|
$model = User::find($this->getUserId());
|
|
|
|
|
$oldCompanyName = $model->company_name;
|
|
|
|
|
if (isset($all['password'])) {
|
|
|
|
|
// 判断旧密码是否正确
|
|
|
|
|
if (!Hash::check($all['old_password'], $model->password)) {
|
|
|
|
|
@ -192,10 +193,11 @@ class UserController extends CommonController
|
|
|
|
|
$model->fill($all);
|
|
|
|
|
$model->save();
|
|
|
|
|
// 如果有公司信息,就更新一下公司
|
|
|
|
|
if (isset($all['company_name']) && !empty($all['company_name']) && $model->company_name != $all['company_name']) {
|
|
|
|
|
// 设置待更新标记,由定时任务处理
|
|
|
|
|
$model->company_id = -1;
|
|
|
|
|
if (isset($all['company_name']) && !empty($all['company_name']) && $oldCompanyName != $all['company_name']) {
|
|
|
|
|
$model->company_id = null;
|
|
|
|
|
$model->save();
|
|
|
|
|
|
|
|
|
|
Company::updateCompanyFromCache($model);
|
|
|
|
|
}
|
|
|
|
|
// 判断下,如果用户新加入车牌号,并且有未开始或者进行中的预约,则直接预约车牌号
|
|
|
|
|
$appointmentModel = Appointment::where('user_id', $this->getUserId())
|
|
|
|
|
|