allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 tangxuhui
提交 45b846ea23b97c3f172538bb2c7ceda14a742b64 1 个父辈 4ed70d7f

数据结构调整

内嵌 并排对比
正在显示 2 个修改的文件 包含 18 行增加 和 12 行删除
@@ -184,12 +184,12 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -184,12 +184,12 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
184 } 184 }
185 u.SalesmanUser.UserId = v.Salesman.UserId 185 u.SalesmanUser.UserId = v.Salesman.UserId
186 u.SalesmanUser.UserInfo.UsersId = v.Salesman.UserId 186 u.SalesmanUser.UserInfo.UsersId = v.Salesman.UserId
187 - u.SalesmanUser.UserInfo.UsersName = v.Salesman.UserInfo.UserName  
188 - u.SalesmanUser.UserInfo.Phone = v.Salesman.UserInfo.UserPhone 187 + u.SalesmanUser.UserInfo.UsersName = v.Salesman.UserName
  188 + u.SalesmanUser.UserInfo.Phone = v.Salesman.UserPhone
189 u.ReferrerUser.UserId = v.Referrer.UserId 189 u.ReferrerUser.UserId = v.Referrer.UserId
190 u.ReferrerUser.UserInfo.UsersId = v.Referrer.UserId 190 u.ReferrerUser.UserInfo.UsersId = v.Referrer.UserId
191 - u.ReferrerUser.UserInfo.UsersName = v.Referrer.UserInfo.UserName  
192 - u.ReferrerUser.UserInfo.Phone = v.Referrer.UserInfo.UserPhone 191 + u.ReferrerUser.UserInfo.UsersName = v.Referrer.UserName
  192 + u.ReferrerUser.UserInfo.Phone = v.Referrer.UserPhone
193 contractUndertaker = append(contractUndertaker, u) 193 contractUndertaker = append(contractUndertaker, u)
194 } 194 }
195 undertakerTypesUncheckedAvailable := param.UndertakerTypesUncheckedAvailable 195 undertakerTypesUncheckedAvailable := param.UndertakerTypesUncheckedAvailable
@@ -235,7 +235,7 @@ type CooperationContractUndertake struct { @@ -235,7 +235,7 @@ type CooperationContractUndertake struct {
235 Attachment []domain.Attachment `json:"attachment"` 235 Attachment []domain.Attachment `json:"attachment"`
236 } 236 }
237 237
238 -func ToCooperationContractUndertake(allied_creation_cooperation.DataCooperationContractSearchByUndertaker) *CooperationContractUndertake {  
239 - data := CooperationContractUndertake{}  
240 - return &data  
241 -} 238 +// func ToCooperationContractUndertake(allied_creation_cooperation.DataCooperationContractSearchByUndertaker) *CooperationContractUndertake {
  239 +// data := CooperationContractUndertake{}
  240 +// return &data
  241 +// }
@@ -76,8 +76,11 @@ type CooperationContract struct { @@ -76,8 +76,11 @@ type CooperationContract struct {
76 UserName string `json:"userName"` 76 UserName string `json:"userName"`
77 UserPhone string `json:"userPhone"` 77 UserPhone string `json:"userPhone"`
78 Referrer struct { 78 Referrer struct {
79 - UserId int `json:"userId,string"`  
80 - UserInfo struct { 79 + UserId int `json:"userId,string"`
  80 + UserType int32 `json:"userType"` // 用户类型，1员工，2共创用户，3公开
  81 + UserName string `json:"userName"` // 用户姓名
  82 + UserPhone string `json:"userPhone"` // 用户手机号
  83 + UserInfo struct {
81 UserAvatar string `json:"userAvatar"` // 用户头像 84 UserAvatar string `json:"userAvatar"` // 用户头像
82 UserEmail string `json:"userEmail"` // 用户邮箱 85 UserEmail string `json:"userEmail"` // 用户邮箱
83 UserName string `json:"userName"` // 共创人员姓名 86 UserName string `json:"userName"` // 共创人员姓名
@@ -86,8 +89,11 @@ type CooperationContract struct { @@ -86,8 +89,11 @@ type CooperationContract struct {
86 } `json:"userInfo"` 89 } `json:"userInfo"`
87 } `json:"referrer"` 90 } `json:"referrer"`
88 Salesman struct { 91 Salesman struct {
89 - UserId int `json:"userId,string"`  
90 - UserInfo struct { 92 + UserId int `json:"userId,string"`
  93 + UserType int32 `json:"userType"` // 用户类型，1员工，2共创用户，3公开
  94 + UserName string `json:"userName"` // 用户姓名
  95 + UserPhone string `json:"userPhone"` // 用户手机号
  96 + UserInfo struct {
91 UserAvatar string `json:"userAvatar"` // 用户头像 97 UserAvatar string `json:"userAvatar"` // 用户头像
92 UserEmail string `json:"userEmail"` // 用户邮箱 98 UserEmail string `json:"userEmail"` // 用户邮箱
93 UserName string `json:"userName"` // 共创人员姓名 99 UserName string `json:"userName"` // 共创人员姓名