|
|
@@ -141,7 +141,7 @@ class UserBasicForm extends Model {
|
|
|
}
|
|
|
$transaction->commit();
|
|
|
$this->adminOperateLogger->afterUpdate($userModel)->clean()->save([
|
|
|
- 'optType' => '修改会员资料',
|
|
|
+ 'optType' => 'Modification of Member information', // 修改会员资料
|
|
|
'userId' => $this->userId,
|
|
|
'userName' => $userModel->USER_NAME,
|
|
|
// 'nation' => $this->nation,
|
|
|
@@ -176,8 +176,8 @@ class UserBasicForm extends Model {
|
|
|
try {
|
|
|
$userModel = User::findOne(['ID' => $this->userId]);
|
|
|
if($userModel->STATUS==$this->status){
|
|
|
- $statusName = ($userModel->STATUS == 1) ? '激活' : '锁定';
|
|
|
- throw new Exception('当前会员状态已【' . $statusName . '】,无需重复设置!');
|
|
|
+ $statusName = ($userModel->STATUS == 1) ? 'activation' : 'lock'; // 激活 锁定
|
|
|
+ throw new Exception('The current member status is【' . $statusName . '】,Do not need to set it again!'); // 当前会员状态已 无需重复设置
|
|
|
}
|
|
|
$userModel->STATUS = $this->status;
|
|
|
$userModel->STATUS_AT = Date::nowTime();
|
|
|
@@ -191,7 +191,7 @@ class UserBasicForm extends Model {
|
|
|
return null;
|
|
|
}
|
|
|
$this->adminOperateLogger->afterUpdate($this->userId,'ID',['select'=>'ID,STATUS'])->clean()->save([
|
|
|
- 'optType' => ($this->status == 1) ? '会员激活' : '会员锁定',
|
|
|
+ 'optType' => ($this->status == 1) ? 'Member activation' : 'Member of the lock', // 会员激活 会员锁定
|
|
|
]);
|
|
|
return $userModel;
|
|
|
}
|
|
|
@@ -209,7 +209,7 @@ class UserBasicForm extends Model {
|
|
|
try {
|
|
|
$userModel = User::findOne(['ID' => $this->userId]);
|
|
|
if($userModel->IS_MODIFY_PASSWORD==$this->status){
|
|
|
- throw new Exception('状态没有发生改变,无需重复设置!');
|
|
|
+ throw new Exception('The status has not changed, and do not need to set it again');// 状态没有发生改变,无需重复设置!
|
|
|
}
|
|
|
$userModel->IS_MODIFY_PASSWORD = $this->status;
|
|
|
if( !$userModel->save(false) ) {
|