Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev
正在显示
10 个修改的文件
包含
172 行增加
和
109 行删除
| @@ -2,9 +2,10 @@ package service | @@ -2,9 +2,10 @@ package service | ||
| 2 | 2 | ||
| 3 | import ( | 3 | import ( |
| 4 | "errors" | 4 | "errors" |
| 5 | - "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/log" | ||
| 6 | "time" | 5 | "time" |
| 7 | 6 | ||
| 7 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/log" | ||
| 8 | + | ||
| 8 | "github.com/linmadan/egglib-go/core/application" | 9 | "github.com/linmadan/egglib-go/core/application" |
| 9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/factory" | 10 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/factory" |
| 10 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/auth/command" | 11 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/auth/command" |
| @@ -14,8 +14,8 @@ type ListCooperationProjectQuery struct { | @@ -14,8 +14,8 @@ type ListCooperationProjectQuery struct { | ||
| 14 | PageNumber int `json:"pageNumber"` | 14 | PageNumber int `json:"pageNumber"` |
| 15 | // 查询限制 | 15 | // 查询限制 |
| 16 | PageSize int `json:"pageSize" valid:"Required"` | 16 | PageSize int `json:"pageSize" valid:"Required"` |
| 17 | - // 项目状态 全部、招标中、已结束 | ||
| 18 | - // Status int32 `json:"status" valid:"Required"` | 17 | + // 项目状态 1招标中,2结束 0全部 |
| 18 | + Status int32 `json:"status" valid:"Required"` | ||
| 19 | //发起部门名称 | 19 | //发起部门名称 |
| 20 | DepartmentName string `json:"departmentName"` | 20 | DepartmentName string `json:"departmentName"` |
| 21 | //项目名称 | 21 | //项目名称 |
| 1 | +package dto | ||
| 2 | + | ||
| 3 | +//CooperationMode 共创模式 | ||
| 4 | +// type CooperationMode struct { | ||
| 5 | +// CooperationModeID int `json:"cooperationModeId,string,"` | ||
| 6 | +// CooperationModeName string `json:"cooperationModeName"` | ||
| 7 | +// CooperationModeNumber string `json:"cooperationModeNumber"` | ||
| 8 | +// } | ||
| 9 | + | ||
| 10 | +//Department 部门 | ||
| 11 | +// type Department struct { | ||
| 12 | +// DepartmentId int `json:"departmentId,string"` | ||
| 13 | +// DepartmentName string `json:"departmentName"` | ||
| 14 | +// DepartmentNumber string `json:"departmentNumber"` | ||
| 15 | +// } | ||
| 16 | + | ||
| 17 | +//UserBase 嵌套的用户数据 | ||
| 18 | +// type UserBase struct { | ||
| 19 | +// UsersId int `json:"usersId"` | ||
| 20 | +// UserInfo struct { | ||
| 21 | +// UsersName string `json:"usersName"` | ||
| 22 | +// UsersCode string `json:"usersCode"` | ||
| 23 | +// Phone string `json:"phone"` | ||
| 24 | +// UsersId int `json:"userId,string"` | ||
| 25 | +// } `json:"cooperationProjectSpons"` //共创发起人 | ||
| 26 | +// } | ||
| 27 | + | ||
| 28 | +//CooperationProjectItem 返回共创项目列表项 | ||
| 29 | +// type CooperationProjectItem struct { | ||
| 30 | +// CooperationMode CooperationMode `json:"cooperationMode"` //共创模式 | ||
| 31 | +// CooperationProjectID int `json:"cooperationProjectId,string,"` //id | ||
| 32 | +// CooperationProjectName string `json:"cooperationProjectName"` //共创项目名称 | ||
| 33 | +// CooperationProjectNumber string `json:"cooperationProjectNumber"` //项目编号 | ||
| 34 | +// CooperationProjectPublishTime string `json:"cooperationProjectPublishTime"` //共创项目发布时间 | ||
| 35 | +// Department Department `json:"department"` //项目发起部门 | ||
| 36 | +// Status int `json:"status"` //项目状态 | ||
| 37 | +// CooperationProjectSpons UserBase `json:"cooperationProjectSpons"` | ||
| 38 | +// } | ||
| 39 | + | ||
| 40 | +//CooperationProjectInfo 返回共创项目详情 | ||
| 41 | +// type CooperationProjectInfo struct { | ||
| 42 | +// CooperationMode CooperationMode `json:"cooperationMode"` //共创模式 | ||
| 43 | +// CooperationProjectID int `json:"cooperationProjectId,string,"` //id | ||
| 44 | +// CooperationProjectName string `json:"cooperationProjectName"` //共创项目名称 | ||
| 45 | +// CooperationProjectNumber string `json:"cooperationProjectNumber"` //项目编号 | ||
| 46 | +// CooperationProjectPublishTime string `json:"cooperationProjectPublishTime"` //共创项目发布时间 | ||
| 47 | +// Department Department `json:"department"` //项目发起部门 | ||
| 48 | +// Status int `json:"status"` //项目状态 | ||
| 49 | +// CooperationProjectSpons UserBase `json:"cooperationProjectSpons"` // 项目发起人 | ||
| 50 | +// } |
| 1 | package service | 1 | package service |
| 2 | 2 | ||
| 3 | import ( | 3 | import ( |
| 4 | + "strconv" | ||
| 5 | + | ||
| 4 | "github.com/linmadan/egglib-go/core/application" | 6 | "github.com/linmadan/egglib-go/core/application" |
| 5 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command" | 7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command" |
| 6 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" | 8 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" |
| 7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user" | 9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user" |
| 8 | - "strconv" | ||
| 9 | ) | 10 | ) |
| 10 | 11 | ||
| 11 | // CooperationProjectService 共创项目服务 | 12 | // CooperationProjectService 共创项目服务 |
| @@ -86,16 +87,18 @@ func (srv CooperationProjectService) EndCooperationProject(userMenusCommand *com | @@ -86,16 +87,18 @@ func (srv CooperationProjectService) EndCooperationProject(userMenusCommand *com | ||
| 86 | } | 87 | } |
| 87 | 88 | ||
| 88 | // SearchCooperationProject TODO:获取共创项目列表 | 89 | // SearchCooperationProject TODO:获取共创项目列表 |
| 89 | -func (srv CooperationProjectService) SearchCooperationProject(userMenusCommand *command.ListCooperationProjectQuery) (interface{}, error) { | ||
| 90 | - creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser( | ||
| 91 | - userMenusCommand.Operator) | ||
| 92 | - resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{ | ||
| 93 | - UserId: int(userMenusCommand.Operator.UserId), | 90 | +func (srv CooperationProjectService) SearchCooperationProject(projectQuery *command.ListCooperationProjectQuery) (int, interface{}, error) { |
| 91 | + creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( | ||
| 92 | + projectQuery.Operator) | ||
| 93 | + result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ | ||
| 94 | + PageNumber: projectQuery.PageNumber, | ||
| 95 | + PageSize: projectQuery.PageSize, | ||
| 96 | + Status: int(projectQuery.Status), | ||
| 94 | }) | 97 | }) |
| 95 | if err != nil { | 98 | if err != nil { |
| 96 | - return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | 99 | + return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
| 97 | } | 100 | } |
| 98 | - return map[string]interface{}{ | ||
| 99 | - "accessMenus": resultMenu.Menus, | ||
| 100 | - }, nil | 101 | + // var dataList []dto.CooperationProjectItem |
| 102 | + //TODO 数据填充 | ||
| 103 | + return int(result.Total), result.CooperationProjects, nil | ||
| 101 | } | 104 | } |
| @@ -65,7 +65,7 @@ func (srv UserService) ChangePassword(changePasswordCommand *command.ChangePassw | @@ -65,7 +65,7 @@ func (srv UserService) ChangePassword(changePasswordCommand *command.ChangePassw | ||
| 65 | return struct{}{}, nil | 65 | return struct{}{}, nil |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | -//ChangePassword 修改密码 | 68 | +//ChangePhone 修改手机号 |
| 69 | func (srv UserService) ChangePhone(resetPhoneCommand *command.ResetPhoneCommand) (interface{}, error) { | 69 | func (srv UserService) ChangePhone(resetPhoneCommand *command.ResetPhoneCommand) (interface{}, error) { |
| 70 | smsServeGateway := sms_serve.NewHttplibHttplibSmsServe() | 70 | smsServeGateway := sms_serve.NewHttplibHttplibSmsServe() |
| 71 | err := smsServeGateway.CheckSmsCode(resetPhoneCommand.NewPhone, resetPhoneCommand.SmsCode) | 71 | err := smsServeGateway.CheckSmsCode(resetPhoneCommand.NewPhone, resetPhoneCommand.SmsCode) |
| @@ -85,8 +85,8 @@ func (srv UserService) ChangePhone(resetPhoneCommand *command.ResetPhoneCommand) | @@ -85,8 +85,8 @@ func (srv UserService) ChangePhone(resetPhoneCommand *command.ResetPhoneCommand) | ||
| 85 | return struct{}{}, nil | 85 | return struct{}{}, nil |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | -//UpdateUserInfo 更新用户信息 | ||
| 89 | -func (srv UserService) UpdateUserInfo(updateUserInfoCommand *command.UpdateUserInfoCommand) (interface{}, error) { | 88 | +//UpdateUserBaseInfo 更新用户信息 |
| 89 | +func (srv UserService) UpdateUserBaseInfo(updateUserInfoCommand *command.UpdateUserInfoCommand) (interface{}, error) { | ||
| 90 | creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(domain.Operator{}) | 90 | creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(domain.Operator{}) |
| 91 | user, err := creationUserGateway.UserGet(allied_creation_user.ReqGetUser{ | 91 | user, err := creationUserGateway.UserGet(allied_creation_user.ReqGetUser{ |
| 92 | UserId: int(updateUserInfoCommand.Operator.UserId), | 92 | UserId: int(updateUserInfoCommand.Operator.UserId), |
| @@ -94,10 +94,24 @@ func (srv UserService) UpdateUserInfo(updateUserInfoCommand *command.UpdateUserI | @@ -94,10 +94,24 @@ func (srv UserService) UpdateUserInfo(updateUserInfoCommand *command.UpdateUserI | ||
| 94 | if err != nil { | 94 | if err != nil { |
| 95 | return nil, application.ThrowError(application.BUSINESS_ERROR, "用户不存在") | 95 | return nil, application.ThrowError(application.BUSINESS_ERROR, "用户不存在") |
| 96 | } | 96 | } |
| 97 | + var ( | ||
| 98 | + userName string | ||
| 99 | + avatar string | ||
| 100 | + ) | ||
| 101 | + if len(updateUserInfoCommand.Avatar) > 0 { | ||
| 102 | + avatar = user.UserInfo.Avatar | ||
| 103 | + } else { | ||
| 104 | + avatar = updateUserInfoCommand.Avatar | ||
| 105 | + } | ||
| 106 | + if len(updateUserInfoCommand.UserName) > 0 { | ||
| 107 | + userName = updateUserInfoCommand.UserName | ||
| 108 | + } else { | ||
| 109 | + userName = user.UserInfo.UserName | ||
| 110 | + } | ||
| 97 | _, err = creationUserGateway.UserUpdateBaseInfo(allied_creation_user.ReqUserUpdateBaseInfo{ | 111 | _, err = creationUserGateway.UserUpdateBaseInfo(allied_creation_user.ReqUserUpdateBaseInfo{ |
| 98 | UserId: int64(user.UserId), | 112 | UserId: int64(user.UserId), |
| 99 | - UserName: updateUserInfoCommand.UserName, | ||
| 100 | - Avatar: updateUserInfoCommand.Avatar, | 113 | + UserName: userName, |
| 114 | + Avatar: avatar, | ||
| 101 | Phone: user.UserInfo.Phone, | 115 | Phone: user.UserInfo.Phone, |
| 102 | Email: user.UserInfo.Email, | 116 | Email: user.UserInfo.Email, |
| 103 | }) | 117 | }) |
| @@ -138,7 +138,7 @@ func (srv AuthService) GetQrcode() (interface{}, error) { | @@ -138,7 +138,7 @@ func (srv AuthService) GetQrcode() (interface{}, error) { | ||
| 138 | return data, nil | 138 | return data, nil |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | -//QrcodeLoginStatus 扫码登录状态 | 141 | +//QrcodeLoginStatus 询问扫码登录状态 |
| 142 | func (srv AuthService) QrcodeLoginStatus(queryParam query.QrcodeLoginStatusQuery) (interface{}, error) { | 142 | func (srv AuthService) QrcodeLoginStatus(queryParam query.QrcodeLoginStatusQuery) (interface{}, error) { |
| 143 | qrmsg := domain.QrcodeMessage{} | 143 | qrmsg := domain.QrcodeMessage{} |
| 144 | err := qrmsg.ParseToken(queryParam.Token) | 144 | err := qrmsg.ParseToken(queryParam.Token) |
| @@ -150,8 +150,23 @@ func (srv AuthService) QrcodeLoginStatus(queryParam query.QrcodeLoginStatusQuery | @@ -150,8 +150,23 @@ func (srv AuthService) QrcodeLoginStatus(queryParam query.QrcodeLoginStatusQuery | ||
| 150 | if err != nil { | 150 | if err != nil { |
| 151 | return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 151 | return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
| 152 | } | 152 | } |
| 153 | + loginToken := domain.LoginToken{ | ||
| 154 | + UserId: qrmsgCache.UserId, | ||
| 155 | + UserBaseId: qrmsgCache.UserBaseId, | ||
| 156 | + Account: qrmsgCache.Account, | ||
| 157 | + Platform: domain.LoginPlatformWeb, | ||
| 158 | + CompanyId: qrmsgCache.CompanyId, | ||
| 159 | + OrgId: qrmsgCache.OrgId, | ||
| 160 | + } | ||
| 161 | + accessToken, err := loginToken.GenerateAccessToken() | ||
| 162 | + if err != nil { | ||
| 163 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 164 | + } | ||
| 165 | + _ = accessToken | ||
| 166 | + //TODO 填充token数据 | ||
| 153 | data := map[string]interface{}{ | 167 | data := map[string]interface{}{ |
| 154 | - "isLogin": qrmsgCache.IsLogin, | 168 | + "isLogin": qrmsgCache.IsLogin, |
| 169 | + "accessToken": "", | ||
| 155 | } | 170 | } |
| 156 | return data, nil | 171 | return data, nil |
| 157 | } | 172 | } |
| 1 | package allied_creation_cooperation | 1 | package allied_creation_cooperation |
| 2 | 2 | ||
| 3 | +import "time" | ||
| 4 | + | ||
| 5 | +type CooperationProject struct { | ||
| 6 | + Company struct { | ||
| 7 | + CompanyId int `json:"companyId,string,"` | ||
| 8 | + CompanyLogo string `json:"companyLogo"` | ||
| 9 | + CompanyName string `json:"companyName"` | ||
| 10 | + } `json:"company"` //项目归属企业 | ||
| 11 | + Org struct { | ||
| 12 | + OrgId int `json:"orgId"` | ||
| 13 | + OrgName string `json:"orgName"` | ||
| 14 | + } `json:"org"` //项目创建时的组织 | ||
| 15 | + CooperationMode struct { | ||
| 16 | + CooperationModeId int `json:"cooperationModeId,string,"` | ||
| 17 | + CooperationModeName string `json:"cooperationModeName"` | ||
| 18 | + CooperationModeNumber string `json:"cooperationModeNumber"` | ||
| 19 | + } `json:"cooperationMode"` //项目模式 | ||
| 20 | + CooperationProjectDescription string `json:"cooperationProjectDescription"` | ||
| 21 | + Attachment []struct { | ||
| 22 | + FileType string `json:"fileType"` | ||
| 23 | + Name string `json:"name"` | ||
| 24 | + Url string `json:"url"` | ||
| 25 | + FileSize int `json:"fileSize"` | ||
| 26 | + } `json:"attachment"` //图片附件 | ||
| 27 | + CooperationProjectId int `json:"cooperationProjectId,string,"` | ||
| 28 | + CooperationProjectName string `json:"cooperationProjectName"` | ||
| 29 | + CooperationProjectNumber string `json:"cooperationProjectNumber"` | ||
| 30 | + CooperationProjectPublishTime time.Time `json:"cooperationProjectPublishTime"` | ||
| 31 | + CreatedAt time.Time `json:"createdAt"` | ||
| 32 | + CooperationProjectPublisher struct { | ||
| 33 | + UsersId int `json:"usersId"` | ||
| 34 | + UserInfo struct { | ||
| 35 | + UsersName string `json:"usersName"` | ||
| 36 | + UsersCode string `json:"usersCode"` | ||
| 37 | + Phone string `json:"phone"` | ||
| 38 | + UsersId int `json:"userId,string,"` | ||
| 39 | + } `json:"userInfo"` | ||
| 40 | + } `json:"cooperationProjectPublisher"` //项目发布人,即操作人 | ||
| 41 | + CooperationProjectSponsor struct { | ||
| 42 | + UsersId int `json:"usersId"` | ||
| 43 | + UserInfo struct { | ||
| 44 | + UsersName string `json:"usersName"` | ||
| 45 | + UsersCode string `json:"usersCode"` | ||
| 46 | + Phone string `json:"phone"` | ||
| 47 | + UsersId int `json:"userId,string,"` | ||
| 48 | + } `json:"userInfo"` | ||
| 49 | + } `json:"cooperationProjectSponsor"` //项目发起人 | ||
| 50 | + CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerType"` //共创合约承接对象,1员工,2共创用户,3公开 | ||
| 51 | + Department struct { | ||
| 52 | + DepartmentNumber string `json:"departmentNumber"` | ||
| 53 | + DepartmentId int `json:"departmentId,string,"` | ||
| 54 | + DepartmentName string `json:"departmentName"` | ||
| 55 | + } `json:"department"` //项目发起部门 | ||
| 56 | + Status int `json:"status"` | ||
| 57 | +} | ||
| 58 | + | ||
| 3 | //创建共创项目 | 59 | //创建共创项目 |
| 4 | type ( | 60 | type ( |
| 5 | ReqCooperationProjectAdd struct { | 61 | ReqCooperationProjectAdd struct { |
| @@ -12,7 +68,7 @@ type ( | @@ -12,7 +68,7 @@ type ( | ||
| 12 | } | 68 | } |
| 13 | 69 | ||
| 14 | DataCooperationProjectAdd struct { | 70 | DataCooperationProjectAdd struct { |
| 15 | - CooperationProjectId int `json:"cooperationProjectId"` | 71 | + CooperationProject |
| 16 | } | 72 | } |
| 17 | ) | 73 | ) |
| 18 | 74 | ||
| @@ -32,47 +88,7 @@ type ( | @@ -32,47 +88,7 @@ type ( | ||
| 32 | } | 88 | } |
| 33 | 89 | ||
| 34 | DataCooperationProjectGet struct { | 90 | DataCooperationProjectGet struct { |
| 35 | - CooperationProject struct { | ||
| 36 | - CooperationMode struct { | ||
| 37 | - CooperationModeID int `json:"cooperationModeId,string"` | ||
| 38 | - CooperationModeName string `json:"cooperationModeName"` | ||
| 39 | - CooperationModeNumber string `json:"cooperationModeNumber"` | ||
| 40 | - } `json:"cooperationMode"` | ||
| 41 | - CooperationProjectDescription string `json:"cooperationProjectDescription"` | ||
| 42 | - Images []string `json:"images"` | ||
| 43 | - CooperationProjectID int `json:"cooperationProjectId,string"` | ||
| 44 | - CooperationProjectName string `json:"cooperationProjectName"` | ||
| 45 | - CooperationProjectNumber string `json:"cooperationProjectNumber"` | ||
| 46 | - CooperationProjectPublishTime string `json:"cooperationProjectPublishTime"` | ||
| 47 | - CooperationProjectPublisher struct { | ||
| 48 | - CooperationCompany string `json:"cooperationCompany"` | ||
| 49 | - CooperationDeadline string `json:"cooperationDeadline"` | ||
| 50 | - Email string `json:"email"` | ||
| 51 | - Phone string `json:"phone"` | ||
| 52 | - Status int `json:"status"` | ||
| 53 | - UsersCode string `json:"usersCode"` | ||
| 54 | - UsersID int `json:"usersId,string"` | ||
| 55 | - UsersName string `json:"usersName"` | ||
| 56 | - } `json:"cooperationProjectPublisher"` | ||
| 57 | - CooperationProjectSponsor struct { | ||
| 58 | - CooperationCompany string `json:"cooperationCompany"` | ||
| 59 | - CooperationDeadline string `json:"cooperationDeadline"` | ||
| 60 | - Email string `json:"email"` | ||
| 61 | - Phone string `json:"phone"` | ||
| 62 | - Status int `json:"status"` | ||
| 63 | - UsersCode string `json:"usersCode"` | ||
| 64 | - UsersID int `json:"usersId,string"` | ||
| 65 | - UsersName string `json:"usersName"` | ||
| 66 | - } `json:"cooperationProjectSponsor"` | ||
| 67 | - CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerType"` | ||
| 68 | - Department struct { | ||
| 69 | - CompanyID int `json:"companyId,string"` | ||
| 70 | - OrgCode string `json:"orgCode"` | ||
| 71 | - OrgID int `json:"orgId,string"` | ||
| 72 | - OrgName string `json:"orgName"` | ||
| 73 | - } `json:"department"` | ||
| 74 | - Status int `json:"status"` | ||
| 75 | - } `json:"cooperationProject"` | 91 | + CooperationProject CooperationProject `json:"cooperationProject"` |
| 76 | } | 92 | } |
| 77 | ) | 93 | ) |
| 78 | 94 | ||
| @@ -95,6 +111,7 @@ type ( | @@ -95,6 +111,7 @@ type ( | ||
| 95 | } | 111 | } |
| 96 | 112 | ||
| 97 | DataCooperationProjectUpdate struct { | 113 | DataCooperationProjectUpdate struct { |
| 114 | + CooperationProject | ||
| 98 | } | 115 | } |
| 99 | ) | 116 | ) |
| 100 | 117 | ||
| @@ -126,52 +143,13 @@ type ( | @@ -126,52 +143,13 @@ type ( | ||
| 126 | DepartmentName string `json:"departmentName"` | 143 | DepartmentName string `json:"departmentName"` |
| 127 | //项目名称 | 144 | //项目名称 |
| 128 | CooperationProjectName string `json:"cooperationProjectName"` | 145 | CooperationProjectName string `json:"cooperationProjectName"` |
| 129 | - Status int `json:"status"` | 146 | + // 共创项目状态,1招标中,2结束 0 全部 |
| 147 | + Status int `json:"status"` | ||
| 130 | } | 148 | } |
| 131 | 149 | ||
| 132 | DataCooperationProjectSearch struct { | 150 | DataCooperationProjectSearch struct { |
| 133 | - Total int64 `json:"total"` | ||
| 134 | - CooperationProjects []struct { | ||
| 135 | - CooperationMode struct { | ||
| 136 | - CooperationModeID int `json:"cooperationModeId,string,"` | ||
| 137 | - CooperationModeName string `json:"cooperationModeName"` | ||
| 138 | - CooperationModeNumber string `json:"cooperationModeNumber"` | ||
| 139 | - } `json:"cooperationMode"` | ||
| 140 | - CooperationProjectDescription string `json:"cooperationProjectDescription"` | ||
| 141 | - Images []string `json:"images"` | ||
| 142 | - CooperationProjectID int `json:"cooperationProjectId,string,"` | ||
| 143 | - CooperationProjectName string `json:"cooperationProjectName"` | ||
| 144 | - CooperationProjectNumber string `json:"cooperationProjectNumber"` | ||
| 145 | - CooperationProjectPublishTime string `json:"cooperationProjectPublishTime"` | ||
| 146 | - CooperationProjectPublisher struct { | ||
| 147 | - CooperationCompany string `json:"cooperationCompany"` | ||
| 148 | - CooperationDeadline string `json:"cooperationDeadline"` | ||
| 149 | - Email string `json:"email"` | ||
| 150 | - Phone string `json:"phone"` | ||
| 151 | - Status int `json:"status"` | ||
| 152 | - UsersCode string `json:"usersCode"` | ||
| 153 | - UsersID int `json:"usersId,string,"` | ||
| 154 | - UsersName string `json:"usersName"` | ||
| 155 | - } `json:"cooperationProjectPublisher"` | ||
| 156 | - CooperationProjectSponsor struct { | ||
| 157 | - CooperationCompany string `json:"cooperationCompany"` | ||
| 158 | - CooperationDeadline string `json:"cooperationDeadline"` | ||
| 159 | - Email string `json:"email"` | ||
| 160 | - Phone string `json:"phone"` | ||
| 161 | - Status int `json:"status"` | ||
| 162 | - UsersCode string `json:"usersCode"` | ||
| 163 | - UsersID int `json:"usersId,string,"` | ||
| 164 | - UsersName string `json:"usersName"` | ||
| 165 | - } `json:"cooperationProjectSponsor"` | ||
| 166 | - CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerType"` | ||
| 167 | - Department struct { | ||
| 168 | - CompanyID int `json:"companyId,string,"` | ||
| 169 | - OrgCode string `json:"orgCode"` | ||
| 170 | - OrgID int `json:"orgId,string,"` | ||
| 171 | - OrgName string `json:"orgName"` | ||
| 172 | - } `json:"department"` | ||
| 173 | - Status int `json:"status"` | ||
| 174 | - } `json:"cooperationProjects"` | 151 | + Total int64 `json:"total"` |
| 152 | + CooperationProjects []CooperationProject `json:"cooperationProjects"` | ||
| 175 | } | 153 | } |
| 176 | ) | 154 | ) |
| 177 | 155 |
| @@ -194,7 +194,7 @@ func (controller *CooperationController) SearchCooperationProject() { | @@ -194,7 +194,7 @@ func (controller *CooperationController) SearchCooperationProject() { | ||
| 194 | return | 194 | return |
| 195 | } | 195 | } |
| 196 | cmd.Operator = controller.GetOperator() | 196 | cmd.Operator = controller.GetOperator() |
| 197 | - data, err := svr.SearchCooperationProject(cmd) | 197 | + _, data, err := svr.SearchCooperationProject(cmd) |
| 198 | controller.Response(data, err) | 198 | controller.Response(data, err) |
| 199 | } | 199 | } |
| 200 | 200 |
| @@ -68,6 +68,6 @@ func (controller *UserController) UpdateUserInfo() { | @@ -68,6 +68,6 @@ func (controller *UserController) UpdateUserInfo() { | ||
| 68 | return | 68 | return |
| 69 | } | 69 | } |
| 70 | cmd.Operator = controller.GetOperator() | 70 | cmd.Operator = controller.GetOperator() |
| 71 | - data, err := authService.UpdateUserInfo(cmd) | 71 | + data, err := authService.UpdateUserBaseInfo(cmd) |
| 72 | controller.Response(data, err) | 72 | controller.Response(data, err) |
| 73 | } | 73 | } |
| @@ -7,16 +7,18 @@ import ( | @@ -7,16 +7,18 @@ import ( | ||
| 7 | ) | 7 | ) |
| 8 | 8 | ||
| 9 | func init() { | 9 | func init() { |
| 10 | + //登录注册 | ||
| 10 | web.Router("/v1/app/users/regist/company", &common_controller.CommonController{}, "Post:CompanySignUp") | 11 | web.Router("/v1/app/users/regist/company", &common_controller.CommonController{}, "Post:CompanySignUp") |
| 11 | web.Router("/v1/app/auth/login", &mobile_client.AuthController{}, "Post:Login") | 12 | web.Router("/v1/app/auth/login", &mobile_client.AuthController{}, "Post:Login") |
| 12 | web.Router("/v1/app/auth/access-token", &mobile_client.AuthController{}, "Post:GetAuthAccessToken") | 13 | web.Router("/v1/app/auth/access-token", &mobile_client.AuthController{}, "Post:GetAuthAccessToken") |
| 13 | web.Router("/v1/app/auth/refresh-token", &mobile_client.AuthController{}, "Post:RefreshAuthAccessToken") | 14 | web.Router("/v1/app/auth/refresh-token", &mobile_client.AuthController{}, "Post:RefreshAuthAccessToken") |
| 14 | - | 15 | + //获取用户数据 |
| 15 | web.Router("/v1/app/user/user-info", &mobile_client.AuthController{}, "Post:GetUserInfo") | 16 | web.Router("/v1/app/user/user-info", &mobile_client.AuthController{}, "Post:GetUserInfo") |
| 16 | web.Router("/v1/app/user/user-menu", &mobile_client.AuthController{}, "Post:GetUserMenus") | 17 | web.Router("/v1/app/user/user-menu", &mobile_client.AuthController{}, "Post:GetUserMenus") |
| 17 | web.Router("/v1/app/user/user-orgs", &mobile_client.AuthController{}, "Post:GetUserOrg") | 18 | web.Router("/v1/app/user/user-orgs", &mobile_client.AuthController{}, "Post:GetUserOrg") |
| 18 | - | 19 | + //公司用户注册 |
| 19 | web.Router("/v1/app/auth/company-sign-up", &mobile_client.AuthController{}, "Post:CompanySignUp") | 20 | web.Router("/v1/app/auth/company-sign-up", &mobile_client.AuthController{}, "Post:CompanySignUp") |
| 21 | + //公司重置密码 | ||
| 20 | web.Router("/v1/app/auth/reset-password", &mobile_client.AuthController{}, "Post:ResetPassword") | 22 | web.Router("/v1/app/auth/reset-password", &mobile_client.AuthController{}, "Post:ResetPassword") |
| 21 | web.Router("/v1/app/auth/org-switch", &mobile_client.AuthController{}, "Post:OrgSwitch") | 23 | web.Router("/v1/app/auth/org-switch", &mobile_client.AuthController{}, "Post:OrgSwitch") |
| 22 | } | 24 | } |
-
请 注册 或 登录 后发表评论