作者 陈志颖

合并分支 'dev' 到 'test'

Dev



查看合并请求 !13
... ... @@ -123,10 +123,10 @@ func newQueryOptionV2(request *protocolx.PartnersRequest) map[string]interface{}
func newCompany(company *domain.Company, p *domain.PartnerStatics) userx.Company {
partnerCompany := userx.Company{
Id: company.Id,
Name: company.Name,
Phone: company.Phone,
//SerialNo: p.Id,
Id: company.Id,
Name: company.Name,
Phone: company.Phone,
SerialNo: p.Id,
CareerSerialNo: "",
BusinessSerialNo: "",
DevelopSerialNo: "",
... ...
... ... @@ -233,10 +233,10 @@ func UserInfoV2(header *protocol.RequestHeader, request *protocol.UserInfoReques
PartnerName: partnerInfo.PartnerName,
Phone: partnerInfo.Account,
CooperateCompany: userx.Company{
Id: company.Id,
Name: company.Name,
Phone: company.Phone,
//SerialNo: partnerInfo.Id,
Id: company.Id,
Name: company.Name,
Phone: company.Phone,
SerialNo: partnerInfo.Id,
CareerSerialNo: "",
BusinessSerialNo: "",
DevelopSerialNo: "",
... ... @@ -247,7 +247,7 @@ func UserInfoV2(header *protocol.RequestHeader, request *protocol.UserInfoReques
},
}
//TODO 获取编号
// 获取编号
for _, partnerCategoryInfo := range partnerInfo.PartnerCategoryInfos {
if partnerCategoryInfo.Id == 1 {
u.CooperateCompany.CareerSerialNo = partnerCategoryInfo.Code
... ...
... ... @@ -7,7 +7,7 @@ type Company struct {
//合作区域
District interface{} `json:"district"`
//合作编码
//SerialNo int64 `json:"serialNo"`
SerialNo int64 `json:"serialNo"`
//事业合作编号
CareerSerialNo string `json:"careerSerialNo"`
//业务合作编号
... ...