Merge remote-tracking branch 'origin/develop' into develop

app/controller/task_controller.go

@@ -792,6 +792,10 @@ func (t TaskController) CreateLocalLife(c *gin.Context) {
 		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
+	if data.RecruitStrategys == nil || len(data.RecruitStrategys) == 0 {
+		returnSuccessWithMessage(c, 30030, "招募策略不能为空", nil)
+		return
+	}
 	localId, err := service.LocalLifeService{}.CreateLocalLife(data)
 	if err != nil {
 		logrus.Errorf("[CreateLocalLife] call CreateLocalLife err:%+v\n", err)

app/dao/local_life_dao.go

@@ -51,7 +51,7 @@ func (d LocalLifeDao) GetLocalListOfDay(enterpriseId string, date time.Time) ([]
 
 // 创建本地生活任务
 func (d LocalLifeDao) CreateLocalLife(localLife entity.LocalLifeInfo) error {
-	err := Db.Omit("auto_fail_at", "pay_at", "submit_at", "pass_at", "finish_at").Create(&localLife).Error
+	err := Db.Omit("auto_fail_at", "pay_at", "submit_at", "pass_at", "finish_at", "fail_at").Create(&localLife).Error
 	if err != nil {
 		return err
 	}

app/dao/local_life_task_info_dao.go

@@ -78,7 +78,7 @@ func (d LocalLifeTaskInfoDao) GetListBySketchDefault(param *vo.DefaultSearchPara
 	var total int64
 	query := Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND cur_default_type = ?", param.TaskId, 4)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, sketch_missing_time")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, sketch_missing_time, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("sketch_missing_time desc").Offset(offset).Limit(param.PageSize).Find(&localTaskInfos).Error; err != nil {
 		return nil, 0, err
@@ -92,7 +92,7 @@ func (d LocalLifeTaskInfoDao) GetListByLinkDefault(param *vo.DefaultSearchParam)
 	var total int64
 	query := Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND cur_default_type = ?", param.TaskId, 6)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, link_missing_time")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, link_missing_time, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("link_missing_time desc").Offset(offset).Limit(param.PageSize).Find(&localTaskInfos).Error; err != nil {
 		return nil, 0, err
@@ -106,7 +106,7 @@ func (d LocalLifeTaskInfoDao) GetListByDataDefault(param *vo.DefaultSearchParam)
 	var total int64
 	query := Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND cur_default_type = ?", param.TaskId, 8)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, data_missing_time")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, data_missing_time, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("data_missing_time desc").Offset(offset).Limit(param.PageSize).Find(&localTaskInfos).Error; err != nil {
 		return nil, 0, err
@@ -120,7 +120,7 @@ func (d LocalLifeTaskInfoDao) GetListByTerminateDefault(param *vo.DefaultSearchP
 	var total int64
 	query := Db.Debug().Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND task_stage = ?", param.TaskId, 17)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, terminate_time, terminate_reason, terminate_operator_type, terminate_operator")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, terminate_time, terminate_reason, terminate_operator_type, terminate_operator, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("terminate_time desc").Offset(offset).Limit(param.PageSize).Find(&localTaskInfos).Error; err != nil {
 		return nil, 0, err
@@ -134,7 +134,7 @@ func (d LocalLifeTaskInfoDao) GetListByCancelDefault(param *vo.DefaultSearchPara
 	var total int64
 	query := Db.Debug().Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND task_stage = ?", param.TaskId, 16)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, cancel_time, cancel_reason, cancel_operator_type, cancel_operator")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, cancel_time, cancel_reason, cancel_operator_type, cancel_operator, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("cancel_time desc").Offset(offset).Limit(param.PageSize).Find(&localTaskInfos).Error; err != nil {
 		return nil, 0, err

app/dao/platform_kuaishou_user_info_dao.go

@@ -1,18 +1,20 @@
 package dao
 
 import (
-	"github.com/sirupsen/logrus"
 	"youngee_b_api/app/entity"
 )
 
 type PlatformKuaishouUserInfoDao struct{}
 
-func (d PlatformKuaishouUserInfoDao) SelectUserInfo(talentId string) (*entity.PlatformKuaishouUserInfo, error) {
-	var userInfo *entity.PlatformKuaishouUserInfo
-	err := Db.Model(entity.PlatformKuaishouUserInfo{}).Select("open_id, nick_name, head_uri").Where("talent_id = ?", talentId).Find(&userInfo).Error
+func (d PlatformKuaishouUserInfoDao) GetUserInfo(openId string) (entity.PlatformKuaishouUserInfo, error) {
+	var userInfo entity.PlatformKuaishouUserInfo
+	err := Db.Model(&entity.PlatformKuaishouUserInfo{}).Select("open_id, platform_id, nick_name, head_uri, city, gender").Where("open_id = ?", openId).Find(&userInfo).Error
 	if err != nil {
-		logrus.Errorf("[SelectUserInfo] error query, err:%+v", err)
-		return nil, err
+		userInfo.OpenID = openId
+		userInfo.NickName = ""
+		userInfo.HeadUri = ""
+		userInfo.City = ""
+		userInfo.Gender = ""
 	}
 	return userInfo, nil
 }

app/dao/project_dao.go

@@ -51,7 +51,7 @@ func (d ProjectDAO) GetProjectListOfDay(enterpriseId string, date time.Time) ([]
 
 // 创建种草任务
 func (d ProjectDAO) CreateProject(project entity.Project) error {
-	err := Db.Omit("auto_fail_at", "auto_script_break_at", "auto_sketch_break_at", "pay_at", "pass_at", "finish_at", "submit_at").Create(&project).Error
+	err := Db.Omit("auto_fail_at", "auto_script_break_at", "auto_sketch_break_at", "pay_at", "pass_at", "finish_at", "submit_at", "fail_at").Create(&project).Error
 	if err != nil {
 		return err
 	}

app/dao/project_task_info_dao.go

@@ -32,16 +32,16 @@ func (d ProjectTaskInfoDao) GetListByTaskStage(projectId string, taskStage int64
 		query = query.Where("project_id = ? AND task_stage = ?", projectId, taskStage)
 	}
 	if talentNickname != "" {
-		var talentInfos []entity.YoungeeTalentInfo
-		err1 := Db.Model(&entity.YoungeeTalentInfo{}).Where("talent_wx_nickname = ?", talentNickname).Find(&talentInfos).Error
+		var talentInfos []entity.PlatformKuaishouUserInfo
+		err1 := Db.Model(&entity.PlatformKuaishouUserInfo{}).Where("nick_name = ?", talentNickname).Find(&talentInfos).Error
 		if err1 != nil {
 			return nil, 0, err1
 		}
-		var talentIds []string
+		var openIds []string
 		for _, talentInfo := range talentInfos {
-			talentIds = append(talentIds, talentInfo.ID)
+			openIds = append(openIds, talentInfo.OpenID)
 		}
-		query = query.Where("talent_id in ?", talentIds)
+		query = query.Where("open_id in ?", openIds)
 	}
 	// 计算偏移量
 	offset := (page - 1) * pageSize
@@ -71,7 +71,7 @@ func (d ProjectTaskInfoDao) GetListBySketchDefault(param *vo.DefaultSearchParam)
 	var total int64
 	query := Db.Model(&entity.ProjectTaskInfo{}).Where("project_id = ? AND cur_default_type = ?", param.TaskId, 4)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, sketch_missing_time")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, sketch_missing_time, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("sketch_missing_time desc").Offset(offset).Limit(param.PageSize).Find(&projectTaskInfos).Error; err != nil {
 		return nil, 0, err
@@ -85,7 +85,7 @@ func (d ProjectTaskInfoDao) GetListByLinkDefault(param *vo.DefaultSearchParam) (
 	var total int64
 	query := Db.Model(&entity.ProjectTaskInfo{}).Where("project_id = ? AND cur_default_type = ?", param.TaskId, 6)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, link_missing_time")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, link_missing_time, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("link_missing_time desc").Offset(offset).Limit(param.PageSize).Find(&projectTaskInfos).Error; err != nil {
 		return nil, 0, err
@@ -99,7 +99,7 @@ func (d ProjectTaskInfoDao) GetListByDataDefault(param *vo.DefaultSearchParam) (
 	var total int64
 	query := Db.Model(&entity.ProjectTaskInfo{}).Where("project_id = ? AND cur_default_type = ?", param.TaskId, 8)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, data_missing_time")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, data_missing_time, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("data_missing_time desc").Offset(offset).Limit(param.PageSize).Find(&projectTaskInfos).Error; err != nil {
 		return nil, 0, err
@@ -113,7 +113,7 @@ func (d ProjectTaskInfoDao) GetListByTerminateDefault(param *vo.DefaultSearchPar
 	var total int64
 	query := Db.Debug().Model(&entity.ProjectTaskInfo{}).Where("project_id = ? AND task_stage = ?", param.TaskId, 17)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, terminate_time, terminate_reason, terminate_operator_type, terminate_operator")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, terminate_time, terminate_reason, terminate_operator_type, terminate_operator, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("terminate_time desc").Offset(offset).Limit(param.PageSize).Find(&projectTaskInfos).Error; err != nil {
 		return nil, 0, err
@@ -127,7 +127,7 @@ func (d ProjectTaskInfoDao) GetListByCancelDefault(param *vo.DefaultSearchParam)
 	var total int64
 	query := Db.Debug().Model(&entity.ProjectTaskInfo{}).Where("project_id = ? AND task_stage = ?", param.TaskId, 16)
 	query.Count(&total)
-	query = query.Select("task_id, talent_id, settle_amount, draft_fee, cancel_time, cancel_reason, cancel_operator_type, cancel_operator")
+	query = query.Select("task_id, talent_id, settle_amount, draft_fee, cancel_time, cancel_reason, cancel_operator_type, cancel_operator, open_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("cancel_time desc").Offset(offset).Limit(param.PageSize).Find(&projectTaskInfos).Error; err != nil {
 		return nil, 0, err

app/dao/selection_info_dao.go

@@ -40,7 +40,7 @@ func (d SelectionInfoDAO) GetSelectionInfoListOfDay(enterpriseId string, date ti
 
 // 创建带货任务
 func (d SelectionInfoDAO) CreateSelectionInfo(selectionInfo entity.SelectionInfo) error {
-	err := Db.Omit("submit_at", "pass_at", "pay_at", "finish_at", "auto_fail_at").Create(&selectionInfo).Error
+	err := Db.Omit("submit_at", "pass_at", "pay_at", "finish_at", "auto_fail_at", "fail_at").Create(&selectionInfo).Error
 	if err != nil {
 		return err
 	}

app/dao/talent_info_dao.go

@@ -8,9 +8,9 @@ import (
 
 type TalentInfoDao struct{}
 
-func (d TalentInfoDao) SelectTalentPhone(talentId string) (*string, error) {
-	var talentInfo *entity.YoungeeTalentInfo
-	err := Db.Model(entity.YoungeeTalentInfo{}).Select("talent_phone_number").Where("id = ?", talentId).Find(&talentInfo).Error
+func (d TalentInfoDao) GetTalentPhone(talentId string) (*string, error) {
+	var talentInfo entity.YoungeeTalentInfo
+	err := Db.Model(&entity.YoungeeTalentInfo{}).Select("talent_phone_number").Where("id = ?", talentId).Find(&talentInfo).Error
 	if err != nil {
 		logrus.Errorf("[SelectTalentInfo] error query, err:%+v", err)
 		return nil, err
@@ -18,7 +18,7 @@ func (d TalentInfoDao) SelectTalentPhone(talentId string) (*string, error) {
 	return &talentInfo.TalentPhoneNumber, nil
 }
 
-func (d TalentInfoDao) SelectTalentInfo(talentId string) (*entity.YoungeeTalentInfo, error) {
+func (d TalentInfoDao) GetTalentInfo(talentId string) (*entity.YoungeeTalentInfo, error) {
 	var talentInfo *entity.YoungeeTalentInfo
 	err := Db.Model(&entity.YoungeeTalentInfo{}).Where("id = ?", talentId).Find(&talentInfo).Error
 	if err != nil {

app/entity/local_life_info.go

@@ -34,6 +34,7 @@ type LocalLifeInfo struct {
 	AutoFailAt          time.Time `gorm:"column:auto_fail_at"`                              // 失效自动处理时间
 	AutoTaskID          int64     `gorm:"column:auto_task_id;default:0;NOT NULL"`           // 定时任务id
 	AutoDefaultID       int64     `gorm:"column:auto_default_id;default:0;NOT NULL"`        // 违约状态id
+	FailAt              time.Time `gorm:"column:fail_at"`                                   // 失效时间
 	FailReason          int64     `gorm:"column:fail_reason"`                               // 失效原因，1、2分别表示逾期未支付、项目存在风险
 	PaymentAmount       float64   `gorm:"column:payment_amount"`                            // 支付金额
 	PayAt               time.Time `gorm:"column:pay_at"`                                    // 支付时间

app/entity/platform_kuaishou_user_info.go

@@ -1,32 +0,0 @@
-// Code generated by sql2gorm. DO NOT EDIT.
-package entity
-
-import (
-	"time"
-)
-
-type PlatformKuaishouUserInfo struct {
-	ID           int64     `gorm:"column:id;primary_key"` // id
-	OpenId       string    `gorm:"column:open_id;NOT NULL"`
-	PlatformId   int64     `gorm:"column:platform_id;NOT NULL"`
-	TalentId     string    `gorm:"column:talent_id;NOT NULL"`
-	Code         string    `gorm:"column:code;NOT NULL"`
-	AccessToken  string    `gorm:"column:access_token;NOT NULL"`
-	RefreshToken string    `gorm:"column:refresh_token;NOT NULL"`
-	NickName     string    `gorm:"column:nick_name;NOT NULL"`
-	HeadUri      string    `gorm:"column:head_uri;NOT NULL"`
-	Fan          string    `gorm:"column:fan;NOT NULL"`
-	Expired      int64     `gorm:"column:expired"`
-	SaleNumTotal int64     `gorm:"column:sale_num_total;NOT NULL"`
-	SaleNum30day int64     `gorm:"column:sale_num_30day;NOT NULL"`
-	CreateTime   time.Time `gorm:"column:create_time;NOT NULL"`
-	UpdateTime   time.Time `gorm:"column:update_time;NOT NULL"`
-	IsDelete     int64     `gorm:"column:is_delete;NOT NULL"`
-	LikeNum      int64     `gorm:"column:like_num;NOT NULL"`
-	VideoNum     int64     `gorm:"column:video_num;NOT NULL"`
-	City         string    `gorm:"column:city"`
-}
-
-func (m *PlatformKuaishouUserInfo) TableName() string {
-	return "platform_kuaishou_user_info"
-}

app/entity/platform_user_info.go

@@ -0,0 +1,37 @@
+// Code generated by sql2gorm. DO NOT EDIT.
+package entity
+
+import (
+	"time"
+)
+
+type PlatformKuaishouUserInfo struct {
+	ID                 int64     `gorm:"column:id;primary_key;AUTO_INCREMENT"` // 主键，自增长
+	OpenID             string    `gorm:"column:open_id"`                       // 用户唯一表示
+	PlatformID         int64     `gorm:"column:platform_id"`                   // 1.红book 2。抖音 3。微博 4。快手（电商）5.B站 6.大众点评 7.知乎 8.快手（平台）
+	TalentID           string    `gorm:"column:talent_id"`                     // 达人id
+	Code               string    `gorm:"column:code"`                          // 扫码后获得的临时票据
+	AccessToken        string    `gorm:"column:access_token"`                  // 调用API需要的参数
+	RefreshToken       string    `gorm:"column:refresh_token"`                 // 用于刷新access_token
+	NickName           string    `gorm:"column:nick_name"`                     // 快手昵称
+	HeadUri            string    `gorm:"column:head_uri"`                      // 用户头像
+	Fan                string    `gorm:"column:fan"`                           // 用户粉丝数
+	Expired            int64     `gorm:"column:expired;default:0"`             // access_token是否可用
+	SaleNum30Day       int64     `gorm:"column:sale_num_30day"`                // 30日销量
+	SaleNumTotal       int64     `gorm:"column:sale_num_total"`                // 总销量
+	CreateTime         time.Time `gorm:"column:create_time"`                   // 创建时间
+	UpdateTime         time.Time `gorm:"column:update_time"`                   // 更新时间
+	IsDelete           int64     `gorm:"column:is_delete;default:0"`           // 是否被删除，默认为0，1表示被删除
+	LikeNum            int64     `gorm:"column:like_num;default:0"`            // 点赞数
+	VideoNum           int64     `gorm:"column:video_num;default:0"`           // 作品数
+	SaleNum7Day        string    `gorm:"column:sale_num_7day;default:0"`       // 近7天销量
+	City               string    `gorm:"column:city"`                          // 用户城市所在地
+	Gender             string    `gorm:"column:gender"`                        // 用户性别
+	Skill              string    `gorm:"column:skill"`                         // 擅长领域
+	HomePageCaptureUrl string    `gorm:"column:home_page_capture_url"`         // 用户主页链接截图
+	HomePageUrl        string    `gorm:"column:home_page_url"`                 // 用户主页链接
+}
+
+func (m *PlatformKuaishouUserInfo) TableName() string {
+	return "platform_kuaishou_user_info"
+}

app/entity/project.go

@@ -33,6 +33,7 @@ type Project struct {
 	PayAt             time.Time `gorm:"column:pay_at"`                         // 支付时间
 	AutoScriptBreakAt time.Time `gorm:"column:auto_script_break_at"`           // 脚本违约自动处理时间
 	AutoSketchBreakAt time.Time `gorm:"column:auto_sketch_break_at"`           // 初稿违约自动处理时间
+	FailAt            time.Time `gorm:"column:fail_at"`                        // 失效时间
 	FailReason        int64     `gorm:"column:fail_reason"`                    // 失效原因，1、2分别表示逾期未支付、项目存在风险
 	PassAt            time.Time `gorm:"column:pass_at"`                        // 审核通过时间
 	FinishAt          time.Time `gorm:"column:finish_at"`                      // 结案时间

app/entity/project_task_info.go

@@ -55,6 +55,7 @@ type ProjectTaskInfo struct {
 	CancelOperatorType     int64     `gorm:"column:cancel_operator_type;default:0;NOT NULL"`
 	CancelOperator         string    `gorm:"column:cancel_operator"`
 	TalentName             string    `gorm:"column:talent_name"`
+	OpenID                 string    `gorm:"column:open_id"` // 达人报名的唯一标识
 }
 
 func (m *ProjectTaskInfo) TableName() string {

app/entity/selection_info.go

@@ -36,6 +36,7 @@ type SelectionInfo struct {
 	UpdatedAt        time.Time `gorm:"column:updated_at"`                    // 修改时间
 	SubmitAt         time.Time `gorm:"column:submit_at"`                     // 提交审核时间
 	PassAt           time.Time `gorm:"column:pass_at"`                       // 审核通过时间
+	FailAt           time.Time `gorm:"column:fail_at"`                       // 失效时间
 	FailReason       int64     `gorm:"column:fail_reason"`                   // 失效原因，1、2分别表示逾期未支付、项目存在风险
 	PayAt            time.Time `gorm:"column:pay_at"`                        // 支付时间
 	FinishAt         time.Time `gorm:"column:finish_at"`                     // 结案时间

app/entity/selection_task_info.go

@@ -38,6 +38,7 @@ type SelectionTaskInfo struct {
 	TeamIncome             int       `gorm:"column:team_income"`                 // young之团团长现金收益
 	TeamPoint              int       `gorm:"column:team_point"`                  // young之团团长积分收益
 	SaleActual             int64     `gorm:"column:sale_actual"`                 // 实际带货量
+	OpenID                 string    `gorm:"column:open_id"`                     // 达人报名的快手唯一标识
 }
 
 func (m *SelectionTaskInfo) TableName() string {

app/schedule/auto_task_invalid.go

@@ -53,10 +53,12 @@ func AutoProjectInvalidTask() {
 			_ = dao.ProjectDAO{}.UpdateProject(entity.Project{
 				ProjectId:     projectId,
 				ProjectStatus: 9,
+				FailReason:    1,
+				FailAt:        time.Now(),
 			})
 			continue
 		}
-		if time.Now().After(projectInfo.RecruitDdl) && projectInfo.ProjectStatus == 4 {
+		if projectInfo.ProjectStatus == 4 && time.Now().After(projectInfo.RecruitDdl) {
 			// 变成待支付
 			_ = dao.ProjectDAO{}.UpdateProject(entity.Project{
 				ProjectId:     projectId,
@@ -79,6 +81,7 @@ func AutoProjectInvalidTask() {
 				ProjectId:     projectId,
 				ProjectStatus: 9,
 				FailReason:    1,
+				FailAt:        time.Now(),
 			})
 			fmt.Println(fmt.Sprintf("已更新品牌种草项目 %s 状态为超时未支付的失效状态", projectId))
 			dao.Db.Model(entity.ProjectTaskInfo{}).Where("project_id = ?", projectId).Updates(entity.ProjectTaskInfo{TaskStage: 3, CompleteStatus: 3, CompleteDate: time.Now()})
@@ -109,6 +112,7 @@ func AutoSelectionInvalidTask() {
 				SelectionID:     selectionId,
 				SelectionStatus: 7,
 				FailReason:      1,
+				FailAt:          time.Now(),
 			})
 			fmt.Println(fmt.Sprintf("已更新电商带货项目 %s 状态为超时未支付的失效状态", selectionId))
 			dao.Db.Model(entity.SelectionInfo{}).Where("selection_id = ?", selectionId).Updates(entity.SelectionTaskInfo{TaskStage: 3, CompleteStatus: 3, CompleteDate: time.Now()})
@@ -130,6 +134,8 @@ func AutoLocalLifeInvalidTask() {
 			_ = dao.LocalLifeDao{}.UpdateLocal(entity.LocalLifeInfo{
 				LocalID:    localId,
 				TaskStatus: 9,
+				FailReason: 1,
+				FailAt:     time.Now(),
 			})
 			continue
 		}
@@ -156,6 +162,7 @@ func AutoLocalLifeInvalidTask() {
 				LocalID:    localId,
 				TaskStatus: 9,
 				FailReason: 1,
+				FailAt:     time.Now(),
 			})
 			fmt.Println(fmt.Sprintf("已更新本地生活项目 %s 状态为超时未支付的失效状态", localId))
 			dao.Db.Model(entity.LocalLifeTaskInfo{}).Where("local_id = ?", localId).Updates(entity.LocalLifeTaskInfo{TaskStage: 3, CompleteStatus: 3, CompleteDate: time.Now()})

app/schedule/auto_task_review.go

@@ -1,6 +1,7 @@
 package schedule
 
 import (
+	"github.com/caixw/lib.go/conv"
 	"github.com/robfig/cron/v3"
 	"log"
 	"strings"
@@ -232,9 +233,24 @@ func AutoProjectReviewTask() {
 		}
 
 		// 审核通过
-		t := time.Now()
 		_ = dao.ProjectReviewDao{}.UpdateProjectReview(&entity.ReviewProject{ID: reviewProject.ID, Status: 2})
-		_ = dao.ProjectDAO{}.UpdateProject(entity.Project{ProjectId: reviewProject.ProjectID, ProjectStatus: 4, PassAt: t})
+		// 更新审核通过时间 与 支付截止时间：任务截止时间 + 设置的失效自动执行时间
+		var projectInfo entity.Project
+		err10 := dao.Db.Model(&entity.Project{}).Where("project_id = ?", reviewProject.ProjectID).Select("project_id,recruit_ddl,auto_task_id").Find(&projectInfo).Error
+		if err10 != nil {
+			continue
+		}
+		autoTaskId := projectInfo.AutoTaskID
+		autoTaskInfo := dao.InfoAutoTaskDao{}.GetValueByIdFieldName(autoTaskId, "invalid")
+		dd, _ := time.ParseDuration(conv.MustString(autoTaskInfo.Invalid, "") + "h")
+		timeInvalid := projectInfo.RecruitDdl.Add(dd)
+		t := time.Now()
+		_ = dao.ProjectDAO{}.UpdateProject(entity.Project{
+			ProjectId:     reviewProject.ProjectID,
+			ProjectStatus: 4,
+			PassAt:        t,
+			AutoFailAt:    timeInvalid,
+		})
 	}
 
 	log.Println("AutoProjectReviewTask running End, Time :", time.Now())
@@ -421,7 +437,21 @@ func AutoSelectionReviewTask() {
 		if selection != nil && selection.TaskMode == 2 {
 			_ = dao.SelectionInfoDAO{}.UpdateSelectionInfo(entity.SelectionInfo{SelectionID: reviewSelection.SelectionID, SelectionStatus: 6, PassAt: t})
 		} else {
-			_ = dao.SelectionInfoDAO{}.UpdateSelectionInfo(entity.SelectionInfo{SelectionID: reviewSelection.SelectionID, SelectionStatus: 4, PassAt: t})
+			var selectionInfo entity.SelectionInfo
+			err10 := dao.Db.Model(&entity.SelectionInfo{}).Where("selection_id = ?", reviewSelection.SelectionID).Select("selection_id,task_ddl,auto_task_id").Find(&selectionInfo).Error
+			if err10 != nil {
+				continue
+			}
+			autoTaskId := selectionInfo.AutoTaskID
+			autoTaskInfo := dao.InfoAutoTaskDao{}.GetValueByIdFieldName(autoTaskId, "invalid")
+			dd, _ := time.ParseDuration(conv.MustString(autoTaskInfo.Invalid, "") + "h")
+			timeInvalid := selectionInfo.TaskDdl.Add(dd)
+			_ = dao.SelectionInfoDAO{}.UpdateSelectionInfo(entity.SelectionInfo{
+				SelectionID:     reviewSelection.SelectionID,
+				SelectionStatus: 4,
+				PassAt:          t,
+				AutoFailAt:      timeInvalid,
+			})
 		}
 	}
 
@@ -670,9 +700,23 @@ func AutoLocalLifeReviewTask() {
 		}
 
 		// 审核通过
-		t := time.Now()
 		_ = dao.LocalLifeReviewDao{}.UpdateLocalReview(&entity.ReviewLocalLife{ID: reviewLocalLife.ID, Status: 2})
-		_ = dao.LocalLifeDao{}.UpdateLocal(entity.LocalLifeInfo{LocalID: reviewLocalLife.LocalID, TaskStatus: 4, PassAt: t})
+		var localLifeInfo entity.LocalLifeInfo
+		err10 := dao.Db.Model(&entity.LocalLifeInfo{}).Where("local_id = ?", reviewLocalLife.LocalID).Select("local_id,recruit_ddl,auto_task_id").Find(&localLifeInfo).Error
+		if err10 != nil {
+			continue
+		}
+		autoTaskId := localLifeInfo.AutoTaskID
+		autoTaskInfo := dao.InfoAutoTaskDao{}.GetValueByIdFieldName(autoTaskId, "invalid")
+		dd, _ := time.ParseDuration(conv.MustString(autoTaskInfo.Invalid, "") + "h")
+		timeInvalid := localLifeInfo.RecruitDdl.Add(dd)
+		t := time.Now()
+		_ = dao.LocalLifeDao{}.UpdateLocal(entity.LocalLifeInfo{
+			LocalID:    reviewLocalLife.LocalID,
+			TaskStatus: 4,
+			PassAt:     t,
+			AutoFailAt: timeInvalid,
+		})
 	}
 
 	log.Println("AutoLocalLifeInvalidTask running End, Time :", time.Now())

app/service/default_service.go

@@ -228,18 +228,19 @@ func (s DefaultService) GetPublicDefaultTalentList(param *vo.DefaultSearchParam)
 		}
 		for _, projectTaskInfo := range projectTaskInfos {
 			talentId := projectTaskInfo.TalentID
-			talentInfo, _ := dao.TalentInfoDao{}.SelectTalentInfo(talentId)
-			platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.SelectUserInfo(talentId)
+			talentInfo, _ := dao.TalentInfoDao{}.GetTalentInfo(talentId)
+			platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.GetUserInfo(projectTaskInfo.OpenID)
 			reTalentDefault := &vo.ReTalentDefault{
 				TalentId:    talentId,
 				TalentPhone: talentInfo.TalentPhoneNumber,
 				TaskId:      projectTaskInfo.TaskID,
 				DraftFee:    projectTaskInfo.DraftFee,
-				OpenId:      platformKuaishouUserInfo.OpenId,
+				OpenId:      platformKuaishouUserInfo.OpenID,
+				PlatformId:  platformKuaishouUserInfo.PlatformID,
 				NickName:    platformKuaishouUserInfo.NickName,
 				HeadUri:     platformKuaishouUserInfo.HeadUri,
 				City:        platformKuaishouUserInfo.City,
-				Gender:      talentInfo.Sex,
+				Gender:      platformKuaishouUserInfo.Gender,
 			}
 			if defaultType == 1 {
 				reTalentDefault.DefaultTime = projectTaskInfo.SketchMissingTime.Format("2006-01-02 15:04:05")
@@ -296,8 +297,8 @@ func (s DefaultService) GetPublicDefaultTalentList(param *vo.DefaultSearchParam)
 			Data:     resultMap,
 		}
 		return result, nil
-		// 本地生活
 	} else if param.TaskType == 2 {
+		// 本地生活
 		var localLifeTaskInfos []entity.LocalLifeTaskInfo
 		var total int64
 		var err error
@@ -328,18 +329,19 @@ func (s DefaultService) GetPublicDefaultTalentList(param *vo.DefaultSearchParam)
 		}
 		for _, localLifeTaskInfo := range localLifeTaskInfos {
 			talentId := localLifeTaskInfo.TalentID
-			talentInfo, _ := dao.TalentInfoDao{}.SelectTalentInfo(talentId)
-			platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.SelectUserInfo(talentId)
+			talentInfo, _ := dao.TalentInfoDao{}.GetTalentInfo(talentId)
+			platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.GetUserInfo(localLifeTaskInfo.OpenID)
 			reTalentDefault := &vo.ReTalentDefault{
 				TalentId:    talentId,
 				TalentPhone: talentInfo.TalentPhoneNumber,
 				TaskId:      localLifeTaskInfo.TaskID,
 				DraftFee:    localLifeTaskInfo.DraftFee,
-				OpenId:      platformKuaishouUserInfo.OpenId,
+				OpenId:      platformKuaishouUserInfo.OpenID,
+				PlatformId:  platformKuaishouUserInfo.PlatformID,
 				NickName:    platformKuaishouUserInfo.NickName,
 				HeadUri:     platformKuaishouUserInfo.HeadUri,
 				City:        platformKuaishouUserInfo.City,
-				Gender:      talentInfo.Sex,
+				Gender:      platformKuaishouUserInfo.Gender,
 			}
 			if defaultType == 1 {
 				reTalentDefault.DefaultTime = localLifeTaskInfo.SketchMissingTime.Format("2006-01-02 15:04:05")
@@ -455,16 +457,19 @@ func (s DefaultService) GetTargetDefaultTalentList(param *vo.DefaultSearchParam)
 	}
 	for _, projectTaskInfo := range projectTaskInfos {
 		talentId := projectTaskInfo.TalentID
-		talentPhone, _ := dao.TalentInfoDao{}.SelectTalentPhone(talentId)
-		platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.SelectUserInfo(talentId)
+		talentInfo, _ := dao.TalentInfoDao{}.GetTalentInfo(talentId)
+		platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.GetUserInfo(projectTaskInfo.OpenID)
 		reTalentDefault := &vo.ReTalentDefault{
 			TalentId:    talentId,
-			TalentPhone: *talentPhone,
+			TalentPhone: talentInfo.TalentPhoneNumber,
+			TaskId:      projectTaskInfo.TaskID,
 			DraftFee:    projectTaskInfo.DraftFee,
-			OpenId:      platformKuaishouUserInfo.OpenId,
+			OpenId:      platformKuaishouUserInfo.OpenID,
+			PlatformId:  platformKuaishouUserInfo.PlatformID,
 			NickName:    platformKuaishouUserInfo.NickName,
 			HeadUri:     platformKuaishouUserInfo.HeadUri,
-			City:        "-",
+			City:        platformKuaishouUserInfo.City,
+			Gender:      platformKuaishouUserInfo.Gender,
 		}
 		if defaultType == 4 {
 			reTalentDefault.DefaultTime = projectTaskInfo.TerminateTime.Format("2006-01-02 15:04:05")

app/service/local_life_service.go

@@ -487,12 +487,21 @@ func (s LocalLifeService) GetLocalLifeDetail(localId string) (*vo.ReLocalDetail,
 		logrus.Errorf("[localLifeDB service] call GetLocalById error,err:%+v", err)
 		return nil, err
 	}
+	if localLife == nil {
+		return nil, errors.New("数据不存在")
+	}
 	// 系统信息
 	reLocalDetail.LocalName = localLife.LocalName
 	reLocalDetail.LocalId = localId
 	reLocalDetail.LocalStatus = localLife.TaskStatus
 	reLocalDetail.LocalPlatform = localLife.LocalPlatform
 	reLocalDetail.CreatedAt = localLife.CreatedAt.Format("2006-01-02 15:04:05")
+	reLocalDetail.SubmitAt = localLife.SubmitAt.Format("2006-01-02 15:04:05")
+	reLocalDetail.PassAt = localLife.AutoFailAt.Format("2006-01-02 15:04:05")
+	reLocalDetail.AutoFailAt = localLife.AutoFailAt.Format("2006-01-02 15:04:05")
+	reLocalDetail.StartAt = localLife.PayAt.Format("2006-01-02 15:04:05")
+	reLocalDetail.FinishAt = localLife.FinishAt.Format("2006-01-02 15:04:05")
+	reLocalDetail.FailAt = localLife.FailAt.Format("2006-01-02 15:04:05")
 	if localLife.TaskStatus < 6 {
 		reLocalDetail.EstimatedCost = localLife.EstimatedCost
 	} else {
@@ -518,7 +527,7 @@ func (s LocalLifeService) GetLocalLifeDetail(localId string) (*vo.ReLocalDetail,
 	// 关联主体
 	var reStore vo.ReStorePreview
 	store, err := dao.StoreDao{}.GetStoreByID(localLife.StoreID)
-	if err == nil {
+	if err == nil && store != nil {
 		photoUrl, e := dao.ProductPhotoDAO{}.GetMainPhotoByStoreID(store.StoreID)
 		if e != nil {
 			photoUrl = ""
@@ -537,7 +546,7 @@ func (s LocalLifeService) GetLocalLifeDetail(localId string) (*vo.ReLocalDetail,
 	reLocalDetail.StoreInfo = &reStore
 	var reTeamBuying vo.ReTeamBuyingPreview
 	teamBuying, err := dao.TeamBuyingDao{}.GetTeamBuyingByID(localLife.TeamBuyingId)
-	if err == nil {
+	if err == nil && teamBuying != nil {
 		photoUrl, e := dao.ProductPhotoDAO{}.GetMainPhotoByTeamBuyingID(teamBuying.TeamBuyingID)
 		if e != nil {
 			photoUrl = ""
@@ -1136,22 +1145,14 @@ func (s LocalLifeService) GetStoreExploreInfo(param *vo.StoreExploreParam) (*vo.
 	}
 	for _, localLifeTaskInfo := range localLifeTaskInfos {
 		// 获取达人信息
-		talentInfo, err := dao.TalentInfoDao{}.SelectTalentInfo(localLifeTaskInfo.TalentID)
-		if err != nil {
-			return nil, err
-		}
-		//regionName, err := dao.RegionInfoDao{}.SelectRegion(talentInfo.VisitStoreRegion)
-		//if err != nil {
-		//	regionName = ""
-		//}
-		regionName := localLifeTaskInfo.City
+		platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.GetUserInfo(localLifeTaskInfo.OpenID)
 		talentPreview := &vo.TalentPreview{
 			TalentId:    localLifeTaskInfo.TalentID,
-			TalentPhoto: talentInfo.Avatar,
-			TalentName:  talentInfo.TalentWxNickname,
-			Account:     "",
-			Location:    regionName,
-			Gender:      talentInfo.Sex,
+			TalentPhoto: platformKuaishouUserInfo.HeadUri,
+			TalentName:  platformKuaishouUserInfo.NickName,
+			Account:     platformKuaishouUserInfo.OpenID,
+			Location:    platformKuaishouUserInfo.City,
+			Gender:      platformKuaishouUserInfo.Gender,
 		}
 		reStoreExploreTalent := &vo.ReStoreExploreTalent{
 			ReTalentPreview: talentPreview,
@@ -1267,8 +1268,9 @@ func (s LocalLifeService) StoreExploreOperate(param *vo.LocalTalentOperateParam)
 	}
 	if param.Status == 1 {
 		err2 := dao.LocalLifeTaskInfoDao{}.UpdateLocalStatus(taskIds, entity.LocalLifeTaskInfo{
-			TaskStage:  7,
-			BookStatus: 5,
+			TaskStage:   7,
+			BookStatus:  5,
+			ExploreTime: time.Now(),
 		})
 		if err2 != nil {
 			return err2

app/service/project_service.go

@@ -508,12 +508,21 @@ func (s ProjectService) GetProjectDetail(projectId string) (*vo.ReProjectDetail,
 		logrus.Errorf("[projectDB service] call GetProject error,err:%+v", err)
 		return nil, err
 	}
+	if project == nil {
+		return nil, errors.New("数据不存在")
+	}
 	reProjectDetail.ProjectName = project.ProjectName
 	// 系统信息
 	reProjectDetail.ProjectId = projectId
 	reProjectDetail.ProjectStatus = project.ProjectStatus
 	reProjectDetail.ProjectPlatform = project.ProjectPlatform
 	reProjectDetail.CreatedAt = project.CreatedAt.Format("2006-01-02 15:04:05")
+	reProjectDetail.SubmitAt = project.SubmitAt.Format("2006-01-02 15:04:05")
+	reProjectDetail.PassAt = project.PassAt.Format("2006-01-02 15:04:05")
+	reProjectDetail.AutoFailAt = project.AutoFailAt.Format("2006-01-02 15:04:05")
+	reProjectDetail.StartAt = project.PayAt.Format("2006-01-02 15:04:05")
+	reProjectDetail.FinishAt = project.FinishAt.Format("2006-01-02 15:04:05")
+	reProjectDetail.FailAt = project.FailAt.Format("2006-01-02 15:04:05")
 	if project.ProjectStatus < 6 {
 		reProjectDetail.EstimatedCost = project.EstimatedCost
 	} else {

app/service/selection_info_service.go

@@ -431,6 +431,9 @@ func (s SelectionInfoService) GetSelectionDetail(selectionId string) (*vo.ReSele
 		logrus.Errorf("[selectionInfoDB service] call GetSelection error,err:%+v", err)
 		return nil, err
 	}
+	if selection == nil {
+		return nil, errors.New("数据不存在")
+	}
 	reSelectionDetail.SelectionName = selection.SelectionName
 	// 系统信息
 	reSelectionDetail.SelectionId = selection.SelectionID
@@ -438,6 +441,11 @@ func (s SelectionInfoService) GetSelectionDetail(selectionId string) (*vo.ReSele
 	reSelectionDetail.SelectionPlatform = selection.Platform
 	reSelectionDetail.CreatedAt = selection.CreatedAt.Format("2006-01-02 15:04:05")
 	reSelectionDetail.SubmitAt = selection.SubmitAt.Format("2006-01-02 15:04:05")
+	reSelectionDetail.PassAt = selection.PassAt.Format("2006-01-02 15:04:05")
+	reSelectionDetail.AutoFailAt = selection.AutoFailAt.Format("2006-01-02 15:04:05")
+	reSelectionDetail.StartAt = selection.PayAt.Format("2006-01-02 15:04:05")
+	reSelectionDetail.FinishAt = selection.FinishAt.Format("2006-01-02 15:04:05")
+	reSelectionDetail.FailAt = selection.FailAt.Format("2006-01-02 15:04:05")
 	reSelectionDetail.RewardSum = selection.EstimatedCost
 	var creatorName, phone string
 	//var rewardSum float64

app/service/task_info_service.go

@@ -60,25 +60,20 @@ func (t TaskInfoService) LogisticsTalentList(param *vo.LogisticsTalentParam) (*v
 	}
 	for _, projectTaskInfo := range projectTaskInfos {
 		// 获取达人信息
-		talentInfo, err := dao.TalentInfoDao{}.SelectTalentInfo(projectTaskInfo.TalentID)
-		if err != nil {
-			return nil, err
-		}
-		regionName, err := dao.RegionInfoDao{}.SelectRegion(talentInfo.VisitStoreRegion)
-		if err != nil {
-			regionName = ""
-		}
+		platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.GetUserInfo(projectTaskInfo.OpenID)
 		taskLogistics, err := dao.TaskLogisticsDao{}.SelectTaskLogistics(projectTaskInfo.TaskID)
 		if err != nil {
 			return nil, err
 		}
 		talentPreview := &vo.TalentPreview{
 			TalentId:    projectTaskInfo.TalentID,
-			TalentPhoto: talentInfo.Avatar,
-			TalentName:  talentInfo.TalentWxNickname,
-			Account:     "",
-			Location:    regionName,
-			Gender:      talentInfo.Sex,
+			TalentPhoto: platformKuaishouUserInfo.HeadUri,
+			TalentName:  platformKuaishouUserInfo.NickName,
+			TaskId:      projectTaskInfo.TaskID,
+			Account:     platformKuaishouUserInfo.OpenID,
+			PlatformId:  platformKuaishouUserInfo.PlatformID,
+			Location:    platformKuaishouUserInfo.City,
+			Gender:      platformKuaishouUserInfo.Gender,
 		}
 		reLogisticsTalent := &vo.ReLogisticsTalent{
 			TaskId:             projectTaskInfo.TaskID,
@@ -203,6 +198,7 @@ func (t TaskInfoService) LogisticsTalentCount(param *vo.LogisticsTalentParam) ma
 	return res
 }
 
+// 电商带货执行中-悬赏兑现
 func (t TaskInfoService) SelectionRewardCashDetail(param *vo.SelectionRewardCashParam) (*vo.ReSelectionRewardCash, error) {
 	if param.Page == 0 {
 		param.Page = 1
@@ -222,14 +218,17 @@ func (t TaskInfoService) SelectionRewardCashDetail(param *vo.SelectionRewardCash
 	}
 	var talentRewardMsgs []vo.TalentRewardMsg
 	for _, selectionTaskInfo := range selectionTaskInfos {
-		talentInfo, _ := dao.TalentInfoDao{}.SelectTalentInfo(selectionTaskInfo.TalentID)
+		platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.GetUserInfo(selectionTaskInfo.OpenID)
 		talentRewardMsg := vo.TalentRewardMsg{
-			PhotoUrl: talentInfo.Avatar,
-			Nickname: talentInfo.TalentNickname,
-			Account:  talentInfo.TalentWxOpenid,
-			Gender:   talentInfo.Sex,
-			OrderNum: selectionTaskInfo.SaleActual,
-			CashTime: selectionTaskInfo.WithdrawDate.Format("2006-01-02 15:04:05"),
+			PhotoUrl:   platformKuaishouUserInfo.HeadUri,
+			Nickname:   platformKuaishouUserInfo.NickName,
+			Account:    platformKuaishouUserInfo.OpenID,
+			PlatformId: platformKuaishouUserInfo.PlatformID,
+			City:       platformKuaishouUserInfo.City,
+			Gender:     platformKuaishouUserInfo.Gender,
+			OrderNum:   selectionTaskInfo.SaleActual,
+			CashTime:   selectionTaskInfo.WithdrawDate.Format("2006-01-02 15:04:05"),
+			TaskId:     selectionTaskInfo.TaskID,
 		}
 		talentRewardMsgs = append(talentRewardMsgs, talentRewardMsg)
 	}

app/vo/re_local_detail.go

@@ -11,6 +11,12 @@ type ReLocalDetail struct {
 	LocalStatus       int64   `json:"localStatus"`       // 项目状态，1-10分别代表创建中、待审核、审核通过、招募中、招募完毕、待支付、已支付、执行中、失效、已结案
 	LocalPlatform     int64   `json:"localPlatform"`     //  项目平台，1-7分别代表红book、抖音、微博、快手、b站、大众点评、知乎
 	CreatedAt         string  `json:"createdAt"`         // 创建时间
+	SubmitAt          string  `json:"submitAt"`          // 提交审核时间
+	PassAt            string  `json:"passAt"`            // 招募开始时间（审核通过时间）
+	AutoFailAt        string  `json:"payEndAt"`          // 支付截止时间
+	StartAt           string  `json:"startAt"`           // 执行开始时间（支付时间）
+	FinishAt          string  `json:"finishAt"`          // 结案时间
+	FailAt            string  `json:"failAt"`            // 失效时间
 	CreatorName       string  `json:"creatorName"`       // 创建者
 	Phone             string  `json:"phone"`             // 联系方式
 	WX                string  `json:"wx"`                // 微信

app/vo/re_logistics_talent.go

@@ -17,6 +17,8 @@ type TalentPreview struct {
 	TalentPhoto string `json:"talentPhoto"`
 	TalentName  string `json:"talentName"`
 	Account     string `json:"account"`
+	PlatformId  int64  `json:"platformId"`
 	Location    string `json:"location"`
-	Gender      int64  `json:"gender"`
+	Gender      string `json:"gender"`
+	TaskId      string `json:"taskId"`
 }

app/vo/re_project_detail.go

@@ -11,6 +11,12 @@ type ReProjectDetail struct {
 	ProjectStatus     int64   `json:"projectStatus"`     // 项目状态，1-10分别代表创建中、待审核、审核通过、招募中、招募完毕、待支付、已支付、执行中、失效、已结案
 	ProjectPlatform   int64   `json:"projectPlatform"`   //  项目平台，1-7分别代表红book、抖音、微博、快手、b站、大众点评、知乎
 	CreatedAt         string  `json:"createdAt"`         // 创建时间
+	SubmitAt          string  `json:"submitAt"`          // 提交审核时间
+	PassAt            string  `json:"passAt"`            // 招募开始时间（审核通过时间）
+	AutoFailAt        string  `json:"payEndAt"`          // 支付截止时间
+	StartAt           string  `json:"startAt"`           // 执行开始时间（支付时间）
+	FinishAt          string  `json:"finishAt"`          // 结案时间
+	FailAt            string  `json:"failAt"`            // 失效时间
 	CreatorName       string  `json:"creatorName"`       // 创建者
 	Phone             string  `json:"phone"`             // 联系方式
 	WX                string  `json:"wx"`                // 微信

app/vo/re_selection_detail.go

@@ -11,11 +11,16 @@ type ReSelectionDetail struct {
 	SelectionStatus   int64   `json:"selectionStatus"`   // 项目状态，1-8分别代表创建中、待审核、审核通过、待支付、已支付、执行中、失效、已结案
 	SelectionPlatform int64   `json:"selectionPlatform"` //  项目平台，1-7分别代表红book、抖音、微博、快手、b站、大众点评、知乎
 	CreatedAt         string  `json:"createdAt"`         // 创建时间
+	SubmitAt          string  `json:"submitAt"`          // 提交审核时间
+	PassAt            string  `json:"passAt"`            // 招募开始时间（审核通过时间）
+	AutoFailAt        string  `json:"payEndAt"`          // 支付截止时间
+	StartAt           string  `json:"startAt"`           // 执行开始时间（支付时间）
+	FinishAt          string  `json:"finishAt"`          // 结案时间
+	FailAt            string  `json:"failAt"`            // 失效时间
 	CreatorName       string  `json:"creatorName"`       // 创建者
 	Phone             string  `json:"phone"`             // 联系方式
 	WX                string  `json:"wx"`                // 微信
 	RewardSum         float64 `json:"rewardSum"`         // 悬赏池总金额
-	SubmitAt          string  `json:"submitAt"`          // 提交审核时间
 	// 支付方式参数待定
 	// 关联商品
 	ProductInfo *ReProductPreview `json:"productInfo"`

app/vo/re_selection_reward_cash.go

@@ -9,10 +9,13 @@ type ReSelectionRewardCash struct {
 }
 
 type TalentRewardMsg struct {
-	PhotoUrl string `json:"photoUrl"`
-	Nickname string `json:"nickname"`
-	Account  string `json:"account"`
-	OrderNum int64  `json:"orderNum"`
-	CashTime string `json:"cashTime"`
-	Gender   int64  `json:"gender"` // 0未知 1男 2女
+	PhotoUrl   string `json:"photoUrl"`
+	Nickname   string `json:"nickname"`
+	Account    string `json:"account"`
+	PlatformId int64  `json:"platformId"`
+	City       string `json:"city"`
+	OrderNum   int64  `json:"orderNum"`
+	CashTime   string `json:"cashTime"`
+	Gender     string `json:"gender"` // U:未知；M，m：男； F女
+	TaskId     string `json:"taskId"`
 }

app/vo/re_talent_default.go

@@ -3,10 +3,11 @@ package vo
 type ReTalentDefault struct {
 	TalentId     string  `json:"talentId"`
 	OpenId       string  `json:"openId"` // 表platform_kuaishou_user_info
+	PlatformId   int64   `json:"platformId"`
 	NickName     string  `json:"nickName"`
 	HeadUri      string  `json:"headUri"`
 	City         string  `json:"city"`
-	Gender       int64   `json:"gender"`       // 0未知 1男 2女
+	Gender       string  `json:"gender"`       // U:未知；M，m：男；F f女
 	TalentPhone  string  `json:"talentPhone"`  // 表youngee_talent_info
 	TaskId       string  `json:"taskId"`       // 任务id
 	DraftFee     float64 `json:"draftFee"`     // 稿费价格