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

修改类型

Browse Source
This commit is contained in:
wucongxing8150 2024-08-22 10:02:05 +08:00
parent 1e4b44178a
commit daad86ee41
2 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/requests/User.go
View File

@ -18,9 +18,9 @@ type PutUser struct {
IsFamilyHistory *int `json:"is_family_history" form:"is_family_history" label:"是否存在家族病史" validate:"omitempty,oneof=0 1 2"` // 是否存在家族病史（0:位置 1:是 2:否） IsFamilyHistory *int `json:"is_family_history" form:"is_family_history" label:"是否存在家族病史" validate:"omitempty,oneof=0 1 2"` // 是否存在家族病史（0:位置 1:是 2:否）
IsPregnant *int `json:"is_pregnant" form:"is_pregnant" label:"是否怀孕" validate:"omitempty,oneof=1 2 3 4"` IsPregnant *int `json:"is_pregnant" form:"is_pregnant" label:"是否怀孕" validate:"omitempty,oneof=1 2 3 4"`
ExpectedDate string `json:"expected_date" form:"expected_date" label:"预产期"` // 假设转换为可选字符串 ExpectedDate string `json:"expected_date" form:"expected_date" label:"预产期"` // 假设转换为可选字符串
ProvinceId string `json:"province_id" form:"province_id" label:"省份id" validate:"required"` // 从int转换为可选字符串 ProvinceId *int64 `json:"province_id" form:"province_id" label:"省份id" validate:"required"` // 从int转换为可选字符串
CityId string `json:"city_id" form:"city_id" label:"城市id" validate:"required"` // 从int转换为可选字符串 CityId *int64 `json:"city_id" form:"city_id" label:"城市id" validate:"required"` // 从int转换为可选字符串
CountyId string `json:"county_id" form:"county_id" label:"区县id" validate:"required"` // 从int转换为可选字符串 CountyId *int64 `json:"county_id" form:"county_id" label:"区县id" validate:"required"` // 从int转换为可选字符串
} }
// PutBindUserName 绑定用户数据-昵称 // PutBindUserName 绑定用户数据-昵称

48
api/service/User.go
View File

@ -14,7 +14,6 @@ import (
"io" "io"
"math/rand" "math/rand"
"net/http" "net/http"
"strconv"
"time" "time"
) )
@ -819,77 +818,60 @@ func (r *UserService) PutUser(userId int64, req requests.PutUser) (bool, error)
} }
// 省份id // 省份id
provinceId, err := strconv.ParseInt(req.ProvinceId, 10, 64) appData.ProvId = req.ProvinceId
if err != nil {
return false, errors.New("省份错误")
}
appData.ProvId = &provinceId
baseAreaDao := dao.BaseAreaDao{} baseAreaDao := dao.BaseAreaDao{}
baseArea, err := baseAreaDao.GetBaseAreaById(provinceId) baseArea, err := baseAreaDao.GetBaseAreaById(*req.ProvinceId)
if err != nil { if err != nil {
return false, errors.New("省份错误") return false, errors.New("省份错误")
} }
if userInfo.ProvinceId != nil { if userInfo.ProvinceId != nil {
if provinceId != *userInfo.ProvinceId { if *req.ProvinceId != *userInfo.ProvinceId {
userInfoData["province_id"] = provinceId userInfoData["province_id"] = *req.ProvinceId
userInfoData["province"] = baseArea.Name userInfoData["province"] = baseArea.Name
} }
} else { } else {
userInfoData["province_id"] = provinceId userInfoData["province_id"] = *req.ProvinceId
userInfoData["province"] = baseArea.Name userInfoData["province"] = baseArea.Name
} }
// 城市id // 城市id
cityId, err := strconv.ParseInt(req.CityId, 10, 64) appData.CityId = req.CityId
if err != nil {
return false, errors.New("城市错误")
}
appData.CityId = &cityId baseArea, err = baseAreaDao.GetBaseAreaById(*req.CityId)
baseArea, err = baseAreaDao.GetBaseAreaById(cityId)
if err != nil { if err != nil {
return false, errors.New("城市错误") return false, errors.New("城市错误")
} }
if userInfo.CityId != nil { if userInfo.CityId != nil {
if cityId != *userInfo.CityId { if *req.CityId != *userInfo.CityId {
userInfoData["city_id"] = cityId userInfoData["city_id"] = *req.CityId
userInfoData["city"] = baseArea.Name userInfoData["city"] = baseArea.Name
} }
} else { } else {
userInfoData["city_id"] = cityId userInfoData["city_id"] = *req.CityId
userInfoData["city"] = baseArea.Name userInfoData["city"] = baseArea.Name
appData.CityId = &cityId
} }
// 区县id // 区县id
countyId, err := strconv.ParseInt(req.CountyId, 10, 64) appData.CountyId = req.CountyId
if err != nil {
return false, errors.New("城市错误")
}
appData.CountyId = &countyId baseArea, err = baseAreaDao.GetBaseAreaById(*req.CountyId)
baseArea, err = baseAreaDao.GetBaseAreaById(countyId)
if err != nil { if err != nil {
return false, errors.New("城市错误") return false, errors.New("城市错误")
} }
if userInfo.CountyId != nil { if userInfo.CountyId != nil {
if countyId != *userInfo.CountyId { if *req.CountyId != *userInfo.CountyId {
userInfoData["county_id"] = countyId userInfoData["county_id"] = *req.CountyId
userInfoData["county"] = baseArea.Name userInfoData["county"] = baseArea.Name
} }
} else { } else {
userInfoData["county_id"] = countyId userInfoData["county_id"] = *req.CountyId
userInfoData["county"] = baseArea.Name userInfoData["county"] = baseArea.Name
appData.CountyId = &countyId
} }
// 开始事务 // 开始事务