gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
wucongxing8150 2024-04-07 14:45:49 +08:00
commit dbd6a3966f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/requests/userDoctor.go
View File

@ -57,6 +57,7 @@ type PutUserDoctor struct {
IdCardBack string `json:"id_card_back" form:"id_card_back" label:"身份证背面图片"`
SignImage string `json:"sign_image" form:"sign_image" label:"签名图片"`
DoctorExpertise []string `json:"doctor_expertise" form:"doctor_expertise" label:"专长"`
Email string `json:"email" form:"email" label:"邮箱"`
BankId string `json:"bank_id" form:"bank_id" validate:"required_with_all=BankCardCode BankCardProvinceId BankCardCityId BankCardCountyId" label:"银行id"`
BankCardCode string `json:"bank_card_code" form:"bank_card_code" validate:"required_with_all=BankId BankCardProvinceId BankCardCityId BankCardCountyId" label:"银行卡号"`
BankCardProvinceId int `json:"bank_card_province_id" form:"bank_card_province_id" validate:"required_with_all=BankId BankCardCode BankCardCityId BankCardCountyId" label:"银行卡省份id"`
@ -87,6 +88,7 @@ type AddUserDoctor struct {
SignImage string `json:"sign_image" form:"sign_image" label:"签名图片"`
CardNum string `json:"card_num" form:"card_num" validate:"required" label:"证件号码"`
DoctorExpertise []string `json:"doctor_expertise" form:"doctor_expertise" label:"专长"`
Email string `json:"email" form:"email" label:"邮箱"`
BankId string `json:"bank_id" form:"bank_id" validate:"required_with_all=BankCardCode BankCardProvinceId BankCardCityId BankCardCountyId" label:"银行id"`
BankCardCode string `json:"bank_card_code" form:"bank_card_code" validate:"required_with_all=BankId BankCardProvinceId BankCardCityId BankCardCountyId" label:"银行卡号"`
BankCardProvinceId int `json:"bank_card_province_id" form:"bank_card_province_id" validate:"required_with_all=BankId BankCardCode BankCardCityId BankCardCountyId" label:"银行卡省份id"`

8
api/service/userDoctor.go
View File

@ -353,6 +353,11 @@ func (r *UserDoctorService) PutUserDoctor(doctorId int64, req requests.PutUserDo
var bankCardCode string
var bankCardCodeMask string
// 邮箱问题
if user.Email != req.Email {
userData["email"] = req.Email
}
// 原银行卡数据存在的情况下，只允许重新替换，不允许删除
if doctorBankCard != nil {
if req.BankCardProvinceId == 0 || req.BankCardCityId == 0 || req.BankCardCountyId == 0 || req.BankCardCode == "" || req.BankId == "" {
@ -500,7 +505,7 @@ func (r *UserDoctorService) PutUserDoctor(doctorId int64, req requests.PutUserDo
}
// 修改用户数据
if len(userDoctorData) != 0 {
if len(userData) != 0 {
err = userDao.EditUserById(tx, userDoctor.UserId, userData)
if err != nil {
tx.Rollback()
@ -930,6 +935,7 @@ func (r *UserDoctorService) AddUserDoctor(userId string, req requests.AddUserDoc
// 新增用户表数据
user := &model.User{
Email: req.Email,
UserName: req.CardName,
Mobile: req.Mobile,
WxMobile: req.Mobile,