diff --git a/api/dto/DoctorWithdrawal.go b/api/dto/DoctorWithdrawal.go index 7383524..a56e2ee 100644 --- a/api/dto/DoctorWithdrawal.go +++ b/api/dto/DoctorWithdrawal.go @@ -30,6 +30,7 @@ type DoctorWithdrawalDto struct { DoctorWithdrawalBank *DoctorWithdrawalBankDto `json:"doctor_withdrawal_bank"` // 医生提现表-关联银行 BankName string `json:"bank_name"` // 提现银行名称 BankCity string `json:"bank_city"` // 提现银行开户行城市 + DoctorUserId string `json:"doctor_user_id"` // 医生user_id } func GetDoctorWithdrawalDto(m *model.DoctorWithdrawal) *DoctorWithdrawalDto { @@ -186,3 +187,11 @@ func (r *DoctorWithdrawalDto) LoadBasicBank(m *model.BasicBank) *DoctorWithdrawa } return r } + +// LoadDoctorUserId 加载医生user_id +func (r *DoctorWithdrawalDto) LoadDoctorUserId(m *model.User) *DoctorWithdrawalDto { + if m != nil { + r.DoctorUserId = fmt.Sprintf("%d", m.UserId) + } + return r +} diff --git a/api/router/router.go b/api/router/router.go index aadea40..14ce172 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -591,4 +591,11 @@ func privateRouter(r *gin.Engine, api controller.Api) { signGroup.POST("", api.UserCaCert.AddUserSignConfig) } } + + // 导出管理 + exportGroup := adminGroup.Group("/export") + { + // 提现记录 + exportGroup.PUT("/withdrawal", api.UserCaCert.RenewUserCloudCert) + } } diff --git a/api/service/doctorWithdrawal.go b/api/service/doctorWithdrawal.go index 48d2159..9a23da9 100644 --- a/api/service/doctorWithdrawal.go +++ b/api/service/doctorWithdrawal.go @@ -29,6 +29,13 @@ func (r *DoctorWithdrawalService) GetDoctorWithdrawal(withdrawalId int64) (g *dt return nil, errors.New("医生数据错误") } + // 获取医生用户数据 + userDao := dao.UserDao{} + user, err := userDao.GetUserById(userDoctor.UserId) + if err != nil || user == nil { + return nil, errors.New("医生数据错误") + } + // 获取医生详情数据 userDoctorInfoDao := dao.UserDoctorInfoDao{} userDoctorInfo, err := userDoctorInfoDao.GetUserDoctorInfoByUserId(userDoctor.UserId) @@ -71,6 +78,9 @@ func (r *DoctorWithdrawalService) GetDoctorWithdrawal(withdrawalId int64) (g *dt // 加载基础银行数据 g.LoadBasicBank(basicBank) + // 加载医生user_id + g.LoadDoctorUserId(user) + return g, nil }