Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/allied-crea…

…tion-gateway into test

 package service
 package service
 
 
 import (
 import (
+	"time"
+
 	"github.com/GeeTeam/gt3-golang-sdk/geetest"
 	"github.com/GeeTeam/gt3-golang-sdk/geetest"
 	"github.com/google/uuid"
 	"github.com/google/uuid"
 	"github.com/linmadan/egglib-go/utils/json"
 	"github.com/linmadan/egglib-go/utils/json"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/auth/dto"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/auth/dto"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/auth/query"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/auth/query"
-	"time"
 
 
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/log"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/log"
 
 
@@ -514,7 +515,7 @@ func (svr AuthService) getUserInfo(operator domain.Operator) (interface{}, error
 		"company": map[string]interface{}{
 		"company": map[string]interface{}{
 			"companyId":   resultUser.Company.CompanyId,
 			"companyId":   resultUser.Company.CompanyId,
 			"companyName": resultUser.Company.CompanyName,
 			"companyName": resultUser.Company.CompanyName,
-			"logo":        resultUser.Company.Log,
+			"logo":        resultUser.Company.Logo,
 			"systemName":  resultUser.Company.SystemName,
 			"systemName":  resultUser.Company.SystemName,
 			"address":     resultUser.Company.Address,
 			"address":     resultUser.Company.Address,
 		},
 		},

 package service
 package service
 
 
 import (
 import (
+	"time"
+
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/utils/json"
 	"github.com/linmadan/egglib-go/utils/json"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
-	"time"
 )
 )
 
 
 // 个人端统计  【0%】
 // 个人端统计  【0%】
@@ -144,7 +145,7 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer
 		cooperationCompanyStatisticsResponses[i].Company = domain.CompanyData{
 		cooperationCompanyStatisticsResponses[i].Company = domain.CompanyData{
 			CompanyID:   user.Org.OrgId,
 			CompanyID:   user.Org.OrgId,
 			CompanyName: user.Org.OrgName,
 			CompanyName: user.Org.OrgName,
-			CompanyLogo: user.Company.Log,
+			CompanyLogo: user.Company.Logo,
 		}
 		}
 		values = append(values, cooperationCompanyStatisticsResponses[i])
 		values = append(values, cooperationCompanyStatisticsResponses[i])
 	}
 	}

@@ -57,7 +57,7 @@ func (dividendsEstimateService *DividendsEstimateService) EstimateMoneyIncentive
 	for i := range result {
 	for i := range result {
 		item := map[string]interface{}{
 		item := map[string]interface{}{
 			"userId":          result[i].DividendsUser.UserId,
 			"userId":          result[i].DividendsUser.UserId,
-			"userName":        result[i].DividendsUser.UserName,
+			"userName":        result[i].DividendsUser.UserInfo.UserName,
 			"dividendsAmount": result[i].DividendsAmount,
 			"dividendsAmount": result[i].DividendsAmount,
 		}
 		}
 		data = append(data, item)
 		data = append(data, item)

@@ -189,10 +189,14 @@ type (
 			UserBaseId int64 `json:"userBaseId,string"`
 			UserBaseId int64 `json:"userBaseId,string"`
 			// 用户类型
 			// 用户类型
 			UserType int32 `json:"userType"`
 			UserType int32 `json:"userType"`
-			// 用户姓名
-			UserName string `json:"userName"`
-			// 用户手机号
-			UserPhone string `json:"userPhone"`
+			UserInfo struct {
+				UserAvatar  string `json:"userAvatar"`  // 用户头像
+				UserEmail   string `json:"userEmail"`   // 用户邮箱
+				UserName    string `json:"userName"`    // 共创人员姓名
+				UserPhone   string `json:"userPhone"`   // 用户手机号
+				UserAccount string `json:"userAccount"` // 用户账号，区别于手机号，冗余字段
+				UserCode    string `json:"userCode"`    //	用户编码
+			} `json:"userInfo,omitempty"`
 		} `json:"dividendsUser"`
 		} `json:"dividendsUser"`
 		// 分红阶段
 		// 分红阶段
 		DividendsStage int32 `json:"dividendsStage"`
 		DividendsStage int32 `json:"dividendsStage"`

@@ -31,7 +31,7 @@ type UserDetail struct {
 		IndustryCategory string    `json:"industryCategory"`
 		IndustryCategory string    `json:"industryCategory"`
 		RegisteredTime   time.Time `json:"registeredTime"`
 		RegisteredTime   time.Time `json:"registeredTime"`
 		Status           int64     `json:"status"`
 		Status           int64     `json:"status"`
-		Log              string    `json:"logo"`
+		Logo             string    `json:"logo"`
 		Address          string    `json:"address"`
 		Address          string    `json:"address"`
 		SystemName       string    `json:"systemName"`
 		SystemName       string    `json:"systemName"`
 	} `json:"company,omitempty"`
 	} `json:"company,omitempty"`