Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/forms/LedgerForm.php
This commit is contained in:
李琦
2026-04-30 13:02:48 +08:00
8 changed files with 372 additions and 68 deletions

View File

@@ -206,6 +206,21 @@ class LoginForm extends BaseModel
'su_id' => $ServiceUser->id,
])->with(['serviceUser'])
->asArray()->one();
// 把ServiceUser信息存在Redis里面使用DB 1key前缀加上doctor_wx区分
$ServiceUserData = [
'user' => [
'id' => $ServiceUser->id,
'mobile' => $ServiceUser->mobile ?? '',
'nickname' => $ServiceUser->nickname ?? '微信用户',
'role' => $ServiceUser->role,
'status' => $ServiceUser->status,
'plate_type' => $ServiceUser->plate_type,
]
];
\Yii::$app->redis->select(1);
\Yii::$app->redis->set('xiaokang_database_xk_user_doctor_wx_' . $token, json_encode($ServiceUserData));
return [
'token'=>$token,
'data'=>$StoreDoctor
@@ -256,6 +271,21 @@ class LoginForm extends BaseModel
$StoreDoctor = StoreDoctor::find()->where([
'su_id' => $ServiceUser->id,
])->with(['serviceUser'])->asArray()->one();
// 把ServiceUser信息存在Redis里面使用DB 1key前缀加上doctor_wx区分
$ServiceUserData = [
'user' => [
'id' => $ServiceUser->id,
'mobile' => $ServiceUser->mobile ?? '',
'nickname' => $ServiceUser->nickname ?? '微信用户',
'role' => $ServiceUser->role,
'status' => $ServiceUser->status,
'plate_type' => $ServiceUser->plate_type,
]
];
\Yii::$app->redis->select(1);
\Yii::$app->redis->set('xiaokang_database_xk_user_doctor_wx_' . $token, json_encode($ServiceUserData));
return [
'token'=>$token,
'data'=>$StoreDoctor,
@@ -321,6 +351,21 @@ class LoginForm extends BaseModel
}
$t->commit();
// 把ServiceUser信息存在Redis里面使用DB 1key前缀加上doctor_wx区分
$ServiceUserData = [
'user' => [
'id' => $ServiceUser->id,
'mobile' => $ServiceUser->mobile ?? '',
'nickname' => $ServiceUser->nickname ?? '微信用户',
'role' => $ServiceUser->role,
'status' => $ServiceUser->status,
'plate_type' => $ServiceUser->plate_type,
]
];
\Yii::$app->redis->select(1);
\Yii::$app->redis->set('xiaokang_database_xk_user_doctor_wx_' . $token, json_encode($ServiceUserData));
return [
'token'=>$token,
'StoreDoctor'=>$StoreDoctor,