From f2a8f1b984d02c6788609eb31fbb7f5b8a8c6f13 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Sun, 7 Apr 2024 14:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/requests/userDoctor.go | 2 ++
 api/service/userDoctor.go  | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/api/requests/userDoctor.go b/api/requests/userDoctor.go
index b63305b..cf61673 100644
--- a/api/requests/userDoctor.go
+++ b/api/requests/userDoctor.go
@@ -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"`
diff --git a/api/service/userDoctor.go b/api/service/userDoctor.go
index 0378ef6..8905eb7 100644
--- a/api/service/userDoctor.go
+++ b/api/service/userDoctor.go
@@ -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,