修改了手机号登陆1

api/service/User.go

@@ -228,39 +228,75 @@ func (r *UserService) HandleAppUserInfo(tx *gorm.DB, user *model.User, userInfo
 	// 省份 id
 	if appUserInfo.Data.ProvinceID != nil {
 		// 获取省份数据
-
+		baseAreaDao := dao.BaseAreaDao{}
 		if userInfo.ProvinceId != nil {
 			if *appUserInfo.Data.ProvinceID != *userInfo.ProvinceId {
 				userInfoData["province_id"] = appUserInfo.Data.ProvinceID
+
+				baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.ProvinceID))
+				if err != nil {
+					return err
+				}
+				userInfoData["province_name"] = baseArea.Name
 			}
 		} else {
 			userInfoData["province_id"] = appUserInfo.Data.ProvinceID
+
+			baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.ProvinceID))
+			if err != nil {
+				return err
+			}
+			userInfoData["province_name"] = baseArea.Name
 		}
 	}
 
 	// 城市 id
 	if appUserInfo.Data.CityID != nil {
 		// 获取城市数据
-
+		baseAreaDao := dao.BaseAreaDao{}
 		if userInfo.CityId != nil {
 			if *appUserInfo.Data.CityID != *userInfo.CityId {
 				userInfoData["city_id"] = appUserInfo.Data.CityID
+
+				baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.ProvinceID))
+				if err != nil {
+					return err
+				}
+				userInfoData["city_name"] = baseArea.Name
 			}
 		} else {
 			userInfoData["city_id"] = appUserInfo.Data.CityID
+
+			baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.ProvinceID))
+			if err != nil {
+				return err
+			}
+			userInfoData["city_name"] = baseArea.Name
 		}
 	}
 
 	// 市区 id
 	if appUserInfo.Data.CountyID != nil {
 		// 获取区县数据
-
+		baseAreaDao := dao.BaseAreaDao{}
 		if userInfo.CountyId != nil {
 			if *appUserInfo.Data.CountyID != *userInfo.CountyId {
 				userInfoData["county_id"] = appUserInfo.Data.CountyID
+
+				baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.ProvinceID))
+				if err != nil {
+					return err
+				}
+				userInfoData["county_name"] = baseArea.Name
 			}
 		} else {
 			userInfoData["county_id"] = appUserInfo.Data.CountyID
+
+			baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.ProvinceID))
+			if err != nil {
+				return err
+			}
+			userInfoData["county_name"] = baseArea.Name
 		}
 	}
 
@@ -289,13 +325,18 @@ func (r *UserService) HandleAppUserInfo(tx *gorm.DB, user *model.User, userInfo
 	// 民族
 	if appUserInfo.Data.NationUUID != "" {
 		// 获取民族数据
-		var nationId int64
+		baseNationDao := dao.BaseNationDao{}
+		baseNation, err := baseNationDao.GetBaseNationByAppIden(appUserInfo.Data.NationUUID)
+		if err != nil {
+			return err
+		}
+
 		if userInfo.NationId != nil {
-			if nationId != *userInfo.NationId {
-				userInfoData["nation_id"] = nationId
+			if baseNation.NationId != *userInfo.NationId {
+				userInfoData["nation_id"] = baseNation.NationId
 			}
 		} else {
-			userInfoData["nation_id"] = nationId
+			userInfoData["nation_id"] = baseNation.NationId
 		}
 	}