gdxz/hepa-calc-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改地址数据int为string

Browse Source
This commit is contained in:
admin
2024-08-23 13:39:05 +08:00
parent 04b6469827
commit c3d4333220
4 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/service/User.go
+28 -25
View File
@@ -251,20 +251,21 @@ func (r *UserService) GetAppUserInfo(tx *gorm.DB, user *model.User, userInfo *mo
if appUserInfo.Data.ProvinceID != nil {
// 获取省份数据
baseAreaDao := dao.BaseAreaDao{}
if userInfo.ProvinceId != nil {
if *appUserInfo.Data.ProvinceID != *userInfo.ProvinceId {
userInfoData["province_id"] = appUserInfo.Data.ProvinceID
if userInfo.ProvinceId != "" {
provinceId := fmt.Sprintf("%d", *appUserInfo.Data.ProvinceID)
if provinceId != userInfo.ProvinceId {
userInfoData["province_id"] = *appUserInfo.Data.ProvinceID
baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.ProvinceID))
baseArea, err := baseAreaDao.GetBaseAreaById(*appUserInfo.Data.ProvinceID)
if err != nil {
return err
}
userInfoData["province"] = baseArea.Name
}
} else {
userInfoData["province_id"] = appUserInfo.Data.ProvinceID
userInfoData["province_id"] = *appUserInfo.Data.ProvinceID
baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.ProvinceID))
baseArea, err := baseAreaDao.GetBaseAreaById(*appUserInfo.Data.ProvinceID)
if err != nil {
return err
}
@@ -276,20 +277,21 @@ func (r *UserService) GetAppUserInfo(tx *gorm.DB, user *model.User, userInfo *mo
if appUserInfo.Data.CityID != nil {
// 获取城市数据
baseAreaDao := dao.BaseAreaDao{}
if userInfo.CityId != nil {
if *appUserInfo.Data.CityID != *userInfo.CityId {
userInfoData["city_id"] = appUserInfo.Data.CityID
if userInfo.CityId != "" {
cityId := fmt.Sprintf("%d", *appUserInfo.Data.CityID)
if cityId != userInfo.CityId {
userInfoData["city_id"] = *appUserInfo.Data.CityID
baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.CityID))
baseArea, err := baseAreaDao.GetBaseAreaById(*appUserInfo.Data.CityID)
if err != nil {
return err
}
userInfoData["city"] = baseArea.Name
}
} else {
userInfoData["city_id"] = appUserInfo.Data.CityID
userInfoData["city_id"] = *appUserInfo.Data.CityID
baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.CityID))
baseArea, err := baseAreaDao.GetBaseAreaById(*appUserInfo.Data.CityID)
if err != nil {
return err
}
@@ -301,20 +303,21 @@ func (r *UserService) GetAppUserInfo(tx *gorm.DB, user *model.User, userInfo *mo
if appUserInfo.Data.CountyID != nil {
// 获取区县数据
baseAreaDao := dao.BaseAreaDao{}
if userInfo.CountyId != nil {
if *appUserInfo.Data.CountyID != *userInfo.CountyId {
userInfoData["county_id"] = appUserInfo.Data.CountyID
if userInfo.CountyId != "" {
countyId := fmt.Sprintf("%d", *appUserInfo.Data.CountyID)
if countyId != userInfo.CountyId {
userInfoData["county_id"] = *appUserInfo.Data.CountyID
baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.CountyID))
baseArea, err := baseAreaDao.GetBaseAreaById(*appUserInfo.Data.CountyID)
if err != nil {
return err
}
userInfoData["county"] = baseArea.Name
}
} else {
userInfoData["county_id"] = appUserInfo.Data.CountyID
userInfoData["county_id"] = *appUserInfo.Data.CountyID
baseArea, err := baseAreaDao.GetBaseAreaById(int64(*appUserInfo.Data.CountyID))
baseArea, err := baseAreaDao.GetBaseAreaById(*appUserInfo.Data.CountyID)
if err != nil {
return err
}
@@ -836,8 +839,8 @@ func (r *UserService) PutUser(userId int64, req requests.PutUser) (bool, error)
return false, errors.New("省份错误")
}
if userInfo.ProvinceId != nil {
if provinceId != *userInfo.ProvinceId {
if userInfo.ProvinceId != "" {
if req.ProvinceId != userInfo.ProvinceId {
userInfoData["province_id"] = provinceId
userInfoData["province"] = baseArea.Name
}
@@ -859,8 +862,8 @@ func (r *UserService) PutUser(userId int64, req requests.PutUser) (bool, error)
return false, errors.New("城市错误")
}
if userInfo.CityId != nil {
if cityId != *userInfo.CityId {
if userInfo.CityId != "" {
if req.CityId != userInfo.CityId {
userInfoData["city_id"] = cityId
userInfoData["city"] = baseArea.Name
@@ -882,8 +885,8 @@ func (r *UserService) PutUser(userId int64, req requests.PutUser) (bool, error)
return false, errors.New("城市错误")
}
if userInfo.CountyId != nil {
if countyId != *userInfo.CountyId {
if userInfo.CountyId != "" {
if req.CountyId != userInfo.CountyId {
userInfoData["county_id"] = countyId
userInfoData["county"] = baseArea.Name
@@ -949,7 +952,7 @@ func (r *UserService) CheckUserInfo(userInfo *model.UserInfo) bool {
return false
}
if userInfo.ProvinceId == nil {
if userInfo.ProvinceId == "" {
return false
}