接口逻辑优化

cmd/internal/dao/artistInfo_user.go

@@ -647,17 +647,17 @@ func GetViewUserList(req *artistInfoUser.FindUsersRequest) (resp []model.UserVie
 func UpdateUserData(req *artistInfoUser.UserInfo) (rep *artistInfoUser.CommonNoParams, err error) {
 	var (
 		preUpdateData    model.User
-		tx               = db.DB.Begin().Preload("RealNameInfo")
 		needUpdateMobile bool
 	)
+	dbfind := db.DB.Begin().Preload("RealNameInfo")
 	if req.Id != 0 {
-		tx = tx.Where("id = ?", req.Id)
+		dbfind = dbfind.Where("id = ?", req.Id)
 	} else if req.MgmtAccId != 0 {
-		tx = tx.Where("mgmt_acc_id = ?", req.MgmtAccId)
+		dbfind = dbfind.Where("mgmt_acc_id = ?", req.MgmtAccId)
 	} else {
 		return nil, errors.New("Id或mgmt_acc_id不能为0")
 	}
-	if err = tx.Find(&preUpdateData).Error; err != nil {
+	if err = dbfind.Find(&preUpdateData).Error; err != nil {
 		return nil, err
 	}
 	//判断需要更新内容
@@ -719,32 +719,12 @@ func UpdateUserData(req *artistInfoUser.UserInfo) (rep *artistInfoUser.CommonNoP
 	if req.WxAccount != "" {
 		preUpdateData.WxAccount = req.WxAccount
 	}
-	//var updateData = model.User{
+
-	//	Model: model.Model{
+	tx := db.DB.Begin()
-	//		ID:        req.Id,
-	//		CreatedAt: time.Unix(req.CreatedAt, 0),
-	//		UpdatedAt: time.Unix(req.UpdatedAt, 0),
-	//		DeletedAt: soft_delete.DeletedAt(req.DeletedAt),
-	//	},
-	//	MgmtAccId:      req.MgmtAccId,
-	//	MgmtArtistId:   req.MgmtArtistId,
-	//	TelNum:         req.TelNum,
-	//	InviteCode:     req.InvitedCode,
-	//	IsRealName:     req.IsRealName,
-	//	RealNameId:     req.RealNameId,
-	//	FddState:       req.FddState,
-	//	CustomerId:     req.CustomerId,
-	//	OpenId:         req.OpenId,
-	//	IsRead:         req.IsRead,
-	//	IsLock:         req.IsLock,
-	//	Account:        req.Account,
-	//	CertificateNum: req.CertificateNum,
-	//	CertificateImg: req.CertificateImg,
-	//	Photo:          req.Photo,
-	//	Htmltype:       req.Htmltype,
-	//	Envtype:        req.Envtype,
-	//}
 	err = tx.Save(&preUpdateData).Error
+	if err != nil {
+		return nil, err
+	}
 	//更新实名信息
 	if req.RealName != nil {
 		var realName = model.RealName{}
@@ -780,7 +760,9 @@ func UpdateUserData(req *artistInfoUser.UserInfo) (rep *artistInfoUser.CommonNoP
 		}
 		err = db.DB.Save(&realName).Error
 	}
-
+	if err != nil {
+		return nil, err
+	}
 	//更新手机号码
 	if needUpdateMobile {
 		// 更新账号服务中手机号
@@ -792,13 +774,13 @@ func UpdateUserData(req *artistInfoUser.UserInfo) (rep *artistInfoUser.CommonNoP
 			Project:   "",
 		}); err != nil {
 			fmt.Println("错误1-needUpdateMobile-AccountImpl.UpdateTelNum:", err.Error())
-			tx.Rollback()
+			//tx.Rollback()
 			return
 		}
 		//更新画家服务中的手机号
 		if _, err = service.GrpcArtistImpl.UpdateProfile(context.Background(), &artist.ProfileRequest{Uid: preUpdateData.MgmtArtistUid, Phone: preUpdateData.TelNum}); err != nil {
 			fmt.Println("错误2-needUpdateMobile-rpcArtistImpl.UpdateProfile:", err.Error())
-			tx.Rollback()
+			//tx.Rollback()
 			return
 		}
 	}