feat:完善信息

This commit is contained in:
henry
2021-10-11 16:30:53 +08:00
parent 0dd46c0c9d
commit 7830ab0c86
15 changed files with 408 additions and 101 deletions

View File

@ -7,7 +7,6 @@ import (
"SciencesServer/app/service"
config2 "SciencesServer/config"
"SciencesServer/serve/orm"
"SciencesServer/utils"
"errors"
"gorm.io/gorm"
"time"
@ -18,11 +17,10 @@ type Tenant struct{ *service.SessionEnterprise }
type TenantHandle func(session *service.SessionEnterprise) *Tenant
type TenantBasicParams struct {
Avatar string `json:"avatar"` // 头像
Name string `json:"name"` // 名称
Email string `json:"email"` // 邮箱
Job string `json:"job"` // 职务
Address string `json:"address"` // 详细地址
Name string `json:"name"` // 名称
Email string `json:"email"` // 邮箱
Job string `json:"job"` // 职务
FixedPhone string `json:"fixed_phone"` // 固定电话
}
type TenantIndustryParams struct {
@ -31,38 +29,35 @@ type TenantIndustryParams struct {
type (
// TenantPerfectParams 完善信息参数
TenantPerfectParams struct {
*TenantBasicParams // 基本信息
*TenantParamsForCompany // 公司身份信息
*TenantBasicParams // 基本信息
}
// TenantParamsForCompany 公司参数信息
TenantParamsForCompany struct {
Name string `json:"name"`
Code string `json:"code"`
config.Area
model2.Position
Industry string `json:"industry"`
Introduce string `json:"introduce"`
}
)
// tenantHandlePerfect 完善信息处理方式
var tenantHandlePerfect = map[int]func(params *TenantPerfectParams) (string, error){
config.TenantUserIdentityForCompany: perfectForCompany,
config.TenantUserIdentityForExpert: perfectForExpert,
config.TenantUserIdentityForCompany: perfectForCompany,
config.TenantUserIdentityForExpert: perfectForExpert,
config.TenantUserIdentityForResearch: perfectForResearch,
config.TenantUserIdentityForLaboratory: perfectForLaboratory,
}
func perfectForCompany(params *TenantPerfectParams) (string, error) {
if params.TenantParamsForCompany == nil {
return "", errors.New("企业信息异常")
}
return utils.AnyToJSON(params.TenantParamsForCompany), nil
return "", nil
}
func perfectForExpert(params *TenantPerfectParams) (string, error) {
return "", nil
}
func perfectForResearch() error {
return nil
func perfectForResearch(params *TenantPerfectParams) (string, error) {
return "", nil
}
func perfectForLaboratory(params *TenantPerfectParams) (string, error) {
return "", nil
}
// Perfect 完善信息
@ -76,48 +71,25 @@ func (c *Tenant) Perfect(params *TenantPerfectParams) error {
// 查询用户身份信息
mUserTenant := model.NewUserTenant()
isExist, err := model2.FirstField(mUserTenant.UserTenant, []string{"id", "name", "identity", "status"},
isExist, err := model2.FirstField(mUserTenant.UserTenant, []string{"id", "name", "identity"},
model2.NewWhere("uid", c.UID), model2.NewWhere("identity", c.Identity))
if err != nil {
return err
} else if isExist {
if mUserTenant.Status != model2.UserTenantStatusForExamining {
return errors.New("资料审核中,不可修改")
} else if mUserTenant.Status != model2.UserTenantStatusForExaminePass {
return errors.New("资料审核已通过,不可修改")
}
}
mUserTenant.Avatar = params.TenantBasicParams.Avatar
mUserTenant.Name = params.TenantBasicParams.Name
mUserTenant.Email = params.TenantBasicParams.Email
mUserTenant.Identity = c.SelectIdentity
mUserTenant.Address = params.TenantBasicParams.Address
mUserTenant.Job = params.TenantBasicParams.Job
mUserTenant.FixedPhone = params.TenantBasicParams.FixedPhone
if mUserTenant.Other, err = _handle(params); err != nil {
return err
}
mUserTenant.Status = model2.UserTenantStatusForExamining
if isExist {
if err = model2.Updates(mUserTenant.UserTenant, mUserTenant.UserTenant); err != nil {
return err
}
return nil
if !isExist {
mUserTenant.Identity = c.SelectIdentity
return model2.Create(mUserTenant.UserTenant)
}
if err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
if err = model2.Updates(mUserTenant.UserTenant, map[string]interface{}{
"selected": model2.UserTenantSelectedForNo, "updated_at": time.Now(),
}); err != nil {
return err
}
mUserTenant.Selected = model2.UserTenantSelectedForYes
return model2.Create(mUserTenant.UserTenant, tx)
}); err != nil {
return err
}
return nil
return model2.Updates(mUserTenant.UserTenant, mUserTenant.UserTenant)
}
// Auth 认证