talent_platform_avatar

db/project.go

@@ -10,7 +10,6 @@ import (
 	"youngee_b_api/model/common_model"
 	"youngee_b_api/model/gorm_model"
 	"youngee_b_api/model/http_model"
-	"youngee_b_api/pack"
 	"youngee_b_api/util"
 
 	"github.com/issue9/conv"
@@ -126,7 +125,7 @@ func GetProjectDraftList(ctx context.Context, enterpriseID string, pageSize, pag
 	return projectDrafts, total, nil
 }
 
-func GetProjectTaskList(ctx context.Context, pageSize, pageNum int64, orderBy []string, orderDesc []int, conditions *common_model.TaskConditions) ([]*http_model.ProjectTaskInfo, int64, error) {
+func GetProjectTaskList(ctx context.Context, pageSize, pageNum int64, orderBy []string, orderDesc []int, conditions *common_model.TaskConditions) ([]*gorm_model.YoungeeTaskInfo, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询task表信息
 	db = db.Debug().Model(gorm_model.YoungeeTaskInfo{})
@@ -185,7 +184,7 @@ func GetProjectTaskList(ctx context.Context, pageSize, pageNum int64, orderBy []
 		db = db.Order("task_id desc")
 	}
 
-	var taskInfos []gorm_model.YoungeeTaskInfo
+	var taskInfos []*gorm_model.YoungeeTaskInfo
 	// 查询总数
 	var totalTask int64
 	if err := db.Model(gorm_model.YoungeeTaskInfo{}).Count(&totalTask).Error; err != nil {
@@ -201,14 +200,14 @@ func GetProjectTaskList(ctx context.Context, pageSize, pageNum int64, orderBy []
 		return nil, 0, err
 	}
 
-	var taskDatas []*http_model.ProjectTaskInfo
-	var newTaskDatas []*http_model.ProjectTaskInfo
-	taskDatas = pack.TaskAccountToTaskInfo(taskInfos)
+	//var taskDatas []*http_model.ProjectTaskInfo
+	var newTaskDatas []*gorm_model.YoungeeTaskInfo
+	//taskDatas = pack.TaskAccountToTaskInfo(taskInfos)
 
-	for _, v := range taskDatas {
+	for _, v := range taskInfos {
 		if platform_nickname == "" {
 			newTaskDatas = append(newTaskDatas, v)
-		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
+		} else if strings.Contains(v.TaskID, platform_nickname) {
 			newTaskDatas = append(newTaskDatas, v)
 		} else if strings.Contains(v.TaskID, platform_nickname) {
 			newTaskDatas = append(newTaskDatas, v)

model/http_model/project_taskList.go

@@ -26,8 +26,8 @@ type ProjectTaskPreview struct {
 	ServiceCharge    float64 `json:"service_charge"`    // 服务费
 	DraftFee         float64 `json:"draft_fee"`         // 达人稿费
 	SupportFee       float64 `json:"support_fee"`       // 提报价格
-	StrategyId       string  `json:"strategy_id"`       // 报名选择的招募策略id
-	TaskStatus       string  `json:"task_status"`       // 任务状态
+	StrategyId       int     `json:"strategy_id"`       // 报名选择的招募策略id
+	TaskStatus       int     `json:"task_status"`       // 任务状态
 	CreateDate       string  `json:"create_date"`       // 创建时间
 	SelectDate       string  `json:"select_date"`       // 商家同意时间
 	DeliveryDate     string  `json:"delivery_date"`     // 发货时间
@@ -81,7 +81,7 @@ type ProjectTaskListData struct {
 	EstimateServiceCharge float64               `json:"estimate_service_charge"` // 预估服务费总额
 	EstimateDraftFee      float64               `json:"estimate_draft_fee"`      // 预估达人总稿费
 	EstimateSupportFee    float64               `json:"estimate_support_fee"`    // 预估提报价格总额
-	Total                 string                `json:"total"`
+	Total                 int64                 `json:"total"`
 }
 
 func NewProjectTaskListRequest() *ProjectTaskListRequest {

pack/project_task_list.go

@@ -25,16 +25,16 @@ func GormFullProjectToHttpProjectTaskPreview(projectTaskInfo *http_model.Project
 		TaskId:           conv.MustString(projectTaskInfo.TaskID),
 		PlatformNickname: conv.MustString(projectTaskInfo.PlatformNickname),
 		FansCount:        conv.MustString(projectTaskInfo.FansCount),
-		StrategyId:       conv.MustString(projectTaskInfo.StrategyID),
-		TaskStatus:       projectTaskInfo.TaskStatus,
-		CreateDate:       createDate,
-		FansNum:          projectTaskInfo.FansNum,
-		VoteAvg:          projectTaskInfo.VoteAvg,
-		CommitAvg:        projectTaskInfo.CommitAvg,
-		BOperator:        projectTaskInfo.BOperator,
-		BOperatorType:    projectTaskInfo.BOperatorType,
-		SOperator:        projectTaskInfo.SOperator,
-		SOperatorType:    projectTaskInfo.SOperatorType,
+		//StrategyId:       conv.MustString(projectTaskInfo.StrategyID),
+		//TaskStatus:       projectTaskInfo.TaskStatus,
+		CreateDate:    createDate,
+		FansNum:       projectTaskInfo.FansNum,
+		VoteAvg:       projectTaskInfo.VoteAvg,
+		CommitAvg:     projectTaskInfo.CommitAvg,
+		BOperator:     projectTaskInfo.BOperator,
+		BOperatorType: projectTaskInfo.BOperatorType,
+		SOperator:     projectTaskInfo.SOperator,
+		SOperatorType: projectTaskInfo.SOperatorType,
 	}
 }
 

route/init.go

@@ -69,6 +69,7 @@ func InitRoute(r *gin.Engine) {
 	sProject := r.Group("/youngee/m/sProject")
 	{
 		sProject.Use(middleware.LoginAuthMiddleware)
+
 		// 服务商版公开种草接口
 		sProject.POST("/fullProjectList", handler.WrapFullProjectListHandler)          // 商单广场-公开种草任务列表
 		sProject.POST("/sProjectList", handler.WrapSProjectListHandler)                // 商单管理-服务商商单列表
@@ -138,7 +139,7 @@ func InitRoute(r *gin.Engine) {
 		// 余额管理
 		f.POST("/supplierAmount/billList", handler.WrapSupplierAmountBillListHandler) // 账单列表
 		f.POST("/supplierAmount/billAmount", handler.WrapSupplierBillAmountHandler)   // 总余额、可提现金额
-		
+
 		// 账单查询
 		f.POST("/fullSProject/billList", handler.WrapFullSProjectBillListHandler)         // 种草任务账单列表
 		f.POST("/fullSProject/taskBillList", handler.WrapFullSProjectTaskBillListHandler) // 种草子任务账单列表

service/project.go

@@ -456,9 +456,52 @@ func (*project) GetProjectTaskList(ctx context.Context, pageSize, pageNum int64,
 		logrus.WithContext(ctx).Errorf("[project service] call GetProjectTaskList error,err:%+v", err)
 		return nil, err
 	}
-	projectTaskListData := new(http_model.ProjectTaskListData)
+	// projectTaskListData := new(http_model.ProjectTaskListData)
+	var projectTaskListData *http_model.ProjectTaskListData
+	projectTaskListData = &http_model.ProjectTaskListData{}
 	// fmt.Println(projectTasks)
-	projectTaskListData.ProjectTaskPreview = pack.MGormProjectTaskToHttpProjectTaskPreview(projectTasks)
+	// projectTaskListData.ProjectTaskPreview = pack.MGormProjectTaskToHttpProjectTaskPreview(projectTasks)
+
+	if projectTasks != nil {
+		projectTaskListData.Total = total
+		for _, projectTask := range projectTasks {
+			var projectTaskInfo *http_model.ProjectTaskPreview
+			projectTaskInfo = &http_model.ProjectTaskPreview{}
+
+			// 2. 补充查询达人身份信息
+			platformUserInfo, platformUserErr := db.FindUserInfoByOpenId(ctx, projectTask.OpenId)
+			if platformUserErr != nil {
+				return nil, platformUserErr
+			}
+			if platformUserInfo != nil {
+				projectTaskInfo.TaskId = projectTask.TaskID
+				projectTaskInfo.TaskStage = projectTask.TaskStage
+				projectTaskInfo.ServiceCharge = projectTask.ServiceCharge
+				projectTaskInfo.DraftFee = projectTask.DraftFee
+				projectTaskInfo.SupportFee = projectTask.SupportFee
+				projectTaskInfo.StrategyId = projectTask.StrategyID
+				projectTaskInfo.TaskStatus = projectTask.TaskStatus
+				projectTaskInfo.CreateDate = conv.MustString(projectTask.CreateDate)
+				projectTaskInfo.SelectDate = conv.MustString(projectTask.SelectDate)
+				projectTaskInfo.DeliveryDate = conv.MustString(projectTask.DeliveryDate)
+				projectTaskInfo.SignedTime = conv.MustString(projectTask.SignedTime)
+				projectTaskInfo.CurBreakAt = conv.MustString(projectTask.CurBreakAt)
+				projectTaskInfo.FansNum = projectTask.FansNum
+				projectTaskInfo.VoteAvg = projectTask.VoteAvg
+				projectTaskInfo.CommitAvg = projectTask.CommitAvg
+				projectTaskInfo.BOperator = projectTask.BOperator
+				projectTaskInfo.BOperatorType = projectTask.BOperatorType
+				projectTaskInfo.SOperator = projectTask.SOperator
+				projectTaskInfo.SOperatorType = projectTask.SOperatorType
+				projectTaskInfo.PlatformNickname = platformUserInfo.NickName
+				projectTaskInfo.FansCount = platformUserInfo.Fan
+				projectTaskInfo.AvatarUrl = platformUserInfo.HeadUri
+				projectTaskInfo.Location = platformUserInfo.City
+				projectTaskInfo.Gender = platformUserInfo.Gender
+				projectTaskListData.ProjectTaskPreview = append(projectTaskListData.ProjectTaskPreview, projectTaskInfo)
+			}
+		}
+	}
 
 	// 2. 查找SProject中其他信息
 	sProjectInfo, sProjectErr := db.GetSProjectDetail(ctx, conditions.SProjectId)
@@ -475,7 +518,6 @@ func (*project) GetProjectTaskList(ctx context.Context, pageSize, pageNum int64,
 		projectTaskListData.EstimateDraftFee = sProjectInfo.EstimateDraftFee
 		projectTaskListData.EstimateSupportFee = sProjectInfo.EstimateSupportFee
 	}
-	projectTaskListData.Total = conv.MustString(total)
 	return projectTaskListData, nil
 }