1

api/service/User.go

@@ -6,8 +6,10 @@ import (
 	"gorm.io/gorm"
 	"hepa-calc-api/api/dao"
 	"hepa-calc-api/api/model"
+	"hepa-calc-api/api/requests"
 	"hepa-calc-api/extend/aliyun"
 	"hepa-calc-api/extend/app"
+	"hepa-calc-api/global"
 	"hepa-calc-api/utils"
 	"io"
 	"math/rand"
@@ -203,6 +205,12 @@ func (r *UserService) HandleAppUserInfo(tx *gorm.DB, user *model.User, userInfo
 
 	// 性别
 	if appUserInfo.Data.Sex != nil {
+		if *appUserInfo.Data.Sex == 0 {
+			*appUserInfo.Data.Sex = 1
+		} else if *appUserInfo.Data.Sex == 1 {
+			*appUserInfo.Data.Sex = 2
+		}
+
 		if user.Sex != nil {
 			if *appUserInfo.Data.Sex != *user.Sex {
 				userData["sex"] = appUserInfo.Data.Sex
@@ -606,3 +614,71 @@ func (r *UserService) HandleAppUserCase(tx *gorm.DB, user *model.User) error {
 
 	return nil
 }
+
+// PutUser 修改用户数据-基本信息
+func (r *UserService) PutUser(userId int64, req requests.PutUser) (bool, error) {
+	//// 获取用户数据
+	//userDao := dao.UserDao{}
+	//user, err := userDao.GetUserById(userId)
+	//if err != nil {
+	//	return false, errors.New("用户数据错误")
+	//}
+	//
+	//// 获取用户数据
+	//userInfoDao := dao.UserInfoDao{}
+	//userInfo, err := userInfoDao.GetUserInfoByUserId(userId)
+	//if err != nil {
+	//	return false, errors.New("用户数据错误")
+	//}
+	//
+	//userData := make(map[string]interface{})
+	//userInfoData := make(map[string]interface{})
+	//appUserData := make(map[string]interface{})
+	//
+	//// 用户名称
+	//if req.UserName != user.UserName {
+	//	userData["user_name"] = req.UserName
+	//	appUserData["name"] = req.UserName
+	//}
+	//
+	//// 注册来源
+	//if req.RegisterSource != user.RegisterSource {
+	//	userData["register_source"] = req.UserName
+	//}
+	//
+	//// 出生日期
+	//birthday := time.Time(*user.Birthday).Format("2006-01-02")
+	//if req.Birthday != birthday {
+	//	userData["birthday"] = req.Birthday
+	//	appUserData["birthday"] = req.Birthday
+	//
+	//	// 年龄
+	//	age, err := utils.CalculateAge(req.Birthday)
+	//	if err != nil {
+	//		return false, errors.New("年龄错误")
+	//	}
+	//	userData["age"] = age
+	//}
+	//
+	//// 性别
+	//if req.Sex != *user.Sex {
+	//	userData["sex"] = req.Sex
+	//
+	//	if req.Sex == 1 {
+	//		appUserData["sex"] = 0
+	//	} else if req.Sex == 2 {
+	//		appUserData["sex"] = 1
+	//	}
+	//}
+
+	// 开始事务
+	tx := global.Db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	tx.Commit()
+	return true, nil
+}