全流程

db/auto_task.go

@@ -11,9 +11,8 @@ import (
 func AutoUpdateStatus() error {
 	db := GetReadDB(context.Background())
 	// 查询task表信息
-	db = db.Debug().Model(gorm_model.ProjectInfo{}).
-		Where("project_status = ? AND recruit_ddl < ?", 4, time.Now())
-	err := db.Update("project_status", 6).Error
+	err := db.Debug().Model(gorm_model.ProjectInfo{}).
+		Where("project_status = ? AND recruit_ddl < ?", 4, time.Now()).Update("project_status", 6).Error
 	if err != nil {
 		log.Println("DB AutoUpdateStatus error :", err)
 		return err

db/data.go

@@ -42,15 +42,8 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			}
 		}
 	}
@@ -59,7 +52,7 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 	// 查询总数
 	var totalTask int64
 	if err := db.Count(&totalTask).Error; err != nil {
-		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
+		logrus.WithContext(ctx).Errorf("[GetTaskDataList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
 	db.Order("task_id").Find(&taskInfos)
@@ -74,9 +67,9 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 
 	// 查询链接
 	db1 := GetReadDB(ctx)
-	db1 = db1.Debug().Model(gorm_model.YounggeeDataInfo{})
+	// db1 = db1.Debug().Model(gorm_model.YounggeeDataInfo{})
 	var LinkInfos []gorm_model.YounggeeLinkInfo
-	db1 = db1.Model(gorm_model.YounggeeLinkInfo{}).Where("task_id IN ? AND is_submit=? AND is_ok = 1", taskIds, 1)
+	db1 = db1.Model(gorm_model.YounggeeLinkInfo{}).Where("task_id IN ? AND is_submit= 1 AND is_ok = 1", taskIds)
 	err := db1.Find(&LinkInfos).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[GetProjectTalentList] error query mysql total, err:%+v", err)
@@ -88,14 +81,20 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 	}
 
 	db2 := GetReadDB(ctx)
-	db2 = db1.Debug().Model(gorm_model.YounggeeDataInfo{})
+	// db2 = db1.Debug().Model(gorm_model.YounggeeDataInfo{})
 
 	var DataInfos []gorm_model.YounggeeDataInfo
-	db2 = db2.Model(gorm_model.YounggeeDataInfo{}).Where("task_id IN ? AND is_submit=? ", taskIds, 1)
+	db2 = db2.Model(gorm_model.YounggeeDataInfo{}).Where("task_id IN ? AND is_submit = 1", taskIds)
+	fmt.Printf("conditions %+v", conditions)
 	if conditions.DataStatus == int64(0) {
-		db2 = db2.Where("is_review = 0").Find(&DataInfos)
+		db2 = db2.Where("is_review = 0")
 	} else {
-		db2 = db2.Where("is_ok = 1").Find(&DataInfos)
+		db2 = db2.Where("is_ok = 1")
+	}
+	err = db2.Find(&DataInfos).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetProjectTalentList] error query mysql total, err:%+v", err)
+		return nil, 0, err
 	}
 	DataMap := make(map[int]gorm_model.YounggeeDataInfo)
 	for _, DataInfo := range DataInfos {
@@ -120,7 +119,7 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 	offset := pageSize * pageNum // assert pageNum start with 0
 	err = db.Order("task_id").Limit(int(limit)).Offset(int(offset)).Error
 	if err != nil {
-		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
+		logrus.WithContext(ctx).Errorf("[GetTaskDataList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
 

db/default.go

@@ -154,19 +154,11 @@ func GetTaskDefaultDataList(ctx context.Context, projectID string, pageSize, pag
 			}
 			continue
 		} else if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			}
 		}
 	}
@@ -297,19 +289,11 @@ func GetTaskTerminatingList(ctx context.Context, projectID string, pageSize, pag
 			}
 			continue
 		} else if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
-				db1 = db1.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db1 = db1.Where("strategy_id in ?", strategyIdList)
+			} else if tag == "project_id" || tag == "strategy_id" {
+				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 			}
 		}
 	}
@@ -393,19 +377,11 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 			}
 			continue
 		} else if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			}
 		}
 	}

db/finish.go

@@ -28,19 +28,11 @@ func GetTaskFinishList(ctx context.Context, pageSize, pageNum int64, conditions
 		tag := field.Tag.Get("condition")
 		value := conditionValue.FieldByName(field.Name)
 		if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			}
 		}
 	}

db/link.go

@@ -38,19 +38,11 @@ func GetTaskLinkList(ctx context.Context, projectID string, pageSize, pageNum in
 			}
 			continue
 		} else if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			}
 		}
 	}

db/logistics.go

@@ -65,19 +65,11 @@ func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageN
 		tag := field.Tag.Get("condition")
 		value := conditionValue.FieldByName(field.Name)
 		if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" || tag == "logistics_status" {
+			} else {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			}
 		}
 	}

db/project.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"strings"
 	"youngee_b_api/consts"
 	"youngee_b_api/model/common_model"
 	"youngee_b_api/model/gorm_model"
@@ -125,6 +126,7 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 	// 根据Project条件过滤
 	conditionType := reflect.TypeOf(conditions).Elem()
 	conditionValue := reflect.ValueOf(conditions).Elem()
+	var platform_nickname string = ""
 	for i := 0; i < conditionType.NumField(); i++ {
 		field := conditionType.Field(i)
 		tag := field.Tag.Get("condition")
@@ -132,6 +134,7 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 		if !util.IsBlank(value) && tag != "platform_nickname" {
 			db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 		} else if tag == "platform_nickname" {
+			platform_nickname = fmt.Sprintf("%v", value.Interface())
 			continue
 		}
 	}
@@ -145,43 +148,8 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 	}
 	db.Order("task_id").Find(&taskInfos)
 
-	// 查询账号id
-	var accountIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
-	for _, taskInfo := range taskInfos {
-		accountIds = append(accountIds, taskInfo.AccountID)
-		taskMap[taskInfo.AccountID] = taskInfo
-	}
-	db1 := GetReadDB(ctx)
-	db1 = db1.Debug().Model(gorm_model.YoungeePlatformAccountInfo{})
-	// 根据Project条件过滤
-	conditionType2 := reflect.TypeOf(conditions).Elem()
-	conditionValue2 := reflect.ValueOf(conditions).Elem()
-	for i := 0; i < conditionType2.NumField(); i++ {
-		field := conditionType2.Field(i)
-		tag := field.Tag.Get("condition")
-		value := conditionValue2.FieldByName(field.Name)
-		if !util.IsBlank(value) && tag == "platform_nickname" { // input:1		taskIdsbase:1,2,3    string
-			db1 = db1.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-		}
-	}
-	var accountInfos []gorm_model.YoungeePlatformAccountInfo
-	db1 = db1.Model(gorm_model.YoungeePlatformAccountInfo{}).Where("account_id IN ?", accountIds).Find(&accountInfos)
-	// 查询总数
-	var totalAccount int64
-	if err := db1.Count(&totalAccount).Error; err != nil {
-		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
-		return nil, 0, err
-	}
-	var misNum int64
-	if totalAccount > totalTask {
-		misNum = totalAccount - totalTask
-	} else {
-		misNum = totalTask - totalAccount
-	}
-	logrus.Println("totalAccount,totalTask,misNum:", totalAccount, totalTask, misNum)
 	// 查询该页数据
-	limit := pageSize + misNum
+	limit := pageSize
 	offset := pageSize * pageNum // assert pageNum start with 0
 	err := db.Order("task_id").Limit(int(limit)).Offset(int(offset)).Error
 	if err != nil {
@@ -189,38 +157,23 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 		return nil, 0, err
 	}
 
-	accountMap := make(map[int]gorm_model.YoungeePlatformAccountInfo)
-	for _, accountInfo := range accountInfos {
-		accountMap[accountInfo.AccountID] = accountInfo
-	}
-	var taskAccounts []*http_model.TaskAccount
-	var projectTasks []*http_model.ProjectTaskInfo
-	for _, accountId := range accountIds {
-		taskAccount := new(http_model.TaskAccount)
-		_, ok := taskMap[accountId]
-		_, ok2 := accountMap[accountId]
-		if ok && ok2 {
-			taskAccount.Task = taskMap[accountId]
-			taskAccount.Account = accountMap[accountId]
-		}
-		taskAccounts = append(taskAccounts, taskAccount)
-	}
+	var taskDatas []*http_model.ProjectTaskInfo
+	var newTaskDatas []*http_model.ProjectTaskInfo
 
-	projectTasks = pack.TaskAccountToTaskInfo(taskAccounts)
-	var fullProjectTasks []*http_model.ProjectTaskInfo
-	// 删除只存在于一个表中的元素
-	for i := 0; i < len(projectTasks); i++ {
-		if projectTasks[i].TaskID != 0 {
-			fullProjectTasks = append(fullProjectTasks, projectTasks[i])
+	taskDatas = pack.TaskAccountToTaskInfo(taskInfos)
+
+	for _, v := range taskDatas {
+		if platform_nickname == "" {
+			newTaskDatas = append(newTaskDatas, v)
+		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
+			newTaskDatas = append(newTaskDatas, v)
+		} else if strings.Contains(conv.MustString(v.TaskID), platform_nickname) {
+			newTaskDatas = append(newTaskDatas, v)
+		} else {
+			totalTask--
 		}
 	}
-	var total int64
-	if totalTask > totalAccount {
-		total = totalAccount
-	} else {
-		total = totalTask
-	}
-	return fullProjectTasks, total, nil
+	return newTaskDatas, totalTask, nil
 }
 
 func GetProjectDetail(ctx context.Context, projectID int64) (*gorm_model.ProjectInfo, error) {
@@ -293,7 +246,7 @@ func GetFeeDetail(ctx context.Context, enterpriseID int64, EndTime string) (*htt
 func SetProjectFinish(ctx context.Context, projectId int64) error {
 	db := GetReadDB(ctx)
 	// 1. 更新项目状态为已结束
-	err := db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates("project_status = 10").Error
+	err := db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates(map[string]interface{}{"project_status": 10}).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Project db] Update ProjectInfo error,err:%+v", err)
 		return err

db/script.go

@@ -37,20 +37,12 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 				db = db.Where("task_stage > ?", 8)
 			}
 			continue
-		}
-		if !util.IsBlank(value) {
+		} else if !util.IsBlank(value) {
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			}
 		}
 	}

db/sketch.go

@@ -41,15 +41,8 @@ func GetTaskSketchList(ctx context.Context, projectID string, pageSize, pageNum
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			}
 		}
 	}

db/task.go

@@ -6,6 +6,7 @@ import (
 	"time"
 	"youngee_b_api/model/gorm_model"
 
+	"github.com/issue9/conv"
 	"github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"gorm.io/gorm"
@@ -15,7 +16,7 @@ func GetTaskList(ctx context.Context, projectID int64) ([]gorm_model.YoungeeTask
 	db := GetReadDB(ctx)
 	tasks := []gorm_model.YoungeeTaskInfo{}
 
-	err := db.Where("project_id=?", projectID).Find(&tasks).Error
+	err := db.Where("project_id=? and task_status = 2", projectID).Find(&tasks).Error
 	if err != nil {
 		return nil, err
 	}
@@ -88,11 +89,20 @@ func ChangeTaskStatus(ctx context.Context, taskIds []string, taskStatus string)
 	return recruitStrategysIDs, nil
 }
 
-func UpdateTaskStage(ctx context.Context, projectID int64, taskStatus int64, taskStage int64) error {
+func UpdateTaskStageByProjectId(ctx context.Context, projectID int64, taskStatus int64, taskStage int64) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id=? and task_status = ?", projectID, taskStatus).Update("task_stage", taskStage).Error
 	if err != nil {
-		logrus.WithContext(ctx).Errorf("[UpdateTaskStatusPaying]2 error query mysql total, err:%+v", err)
+		logrus.WithContext(ctx).Errorf("[UpdateTaskStage]2 error query mysql total, err:%+v", err)
+		return err
+	}
+	return nil
+}
+func UpdateTaskStageByTaskId(ctx context.Context, taskID int64, taskStatus int64, taskStage int64) error {
+	db := GetReadDB(ctx)
+	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id=? and task_status = ?", taskID, taskStatus).Update("task_stage", taskStage).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[UpdateTaskStageByTaskId]2 error query mysql total, err:%+v", err)
 		return err
 	}
 	return nil
@@ -124,7 +134,7 @@ func SetTaskFinish(ctx context.Context, TaskIDs []int) error {
 		// 查询task_info
 		db = GetReadDB(ctx)
 		taskInfo := gorm_model.YoungeeTaskInfo{}
-		err1 := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", v).Scan(taskInfo).Error
+		err1 := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", v).Scan(&taskInfo).Error
 		if err1 != nil {
 			logrus.WithContext(ctx).Errorf("[Task db] Find YoungeeTaskInfo error,err:%+v", err)
 			return err1
@@ -132,7 +142,7 @@ func SetTaskFinish(ctx context.Context, TaskIDs []int) error {
 		// 查询data_info
 		db = GetReadDB(ctx)
 		dataInfo := gorm_model.YounggeeDataInfo{}
-		err1 = db.Model(gorm_model.YounggeeDataInfo{}).Where("task_id = ? and is_ok = 1", v).Scan(dataInfo).Error
+		err1 = db.Model(gorm_model.YounggeeDataInfo{}).Where("task_id = ? and is_ok = 1", v).Scan(&dataInfo).Error
 		if err1 != nil {
 			logrus.WithContext(ctx).Errorf("[Task db] Find YounggeeDataInfo error,err:%+v", err)
 			return err1
@@ -141,8 +151,9 @@ func SetTaskFinish(ctx context.Context, TaskIDs []int) error {
 		// 更新招募策略
 		db = GetReadDB(ctx)
 		db = db.Model(gorm_model.RecruitStrategy{}).Where("project_id = ? and strategy_id = ?", taskInfo.ProjectID, taskInfo.StrategyID)
+		fansCount, _ := strconv.Atoi(conv.MustString(gjson.Get(taskInfo.TalentPlatformInfoSnap, "fans_count")))
 		err = db.Updates(map[string]interface{}{
-			"fan_number":     gorm.Expr("fan_number + ?", gjson.Get(taskInfo.TalentPlatformInfoSnap, "fans_count")),
+			"fan_number":     gorm.Expr("fan_number + ?", fansCount),
 			"play_number":    gorm.Expr("play_number + ?", dataInfo.PlayNumber),
 			"like_number":    gorm.Expr("like_number + ?", dataInfo.LikeNumber),
 			"collect_number": gorm.Expr("collect_number + ?", dataInfo.CollectNumber),

handler/accept_data.go

@@ -50,7 +50,7 @@ func (h *AcceptDataHandler) run() {
 		log.Info("CreateProject fail,req:%+v", h.req)
 		return
 	}
-	h.resp.Message = "成功通过脚本"
+	h.resp.Message = "成功通过数据"
 	h.resp.Data = res
 }
 

handler/accept_link.go

@@ -50,41 +50,11 @@ func (h *AcceptLinkHandler) run() {
 		log.Info("CreateProject fail,req:%+v", h.req)
 		return
 	}
-	h.resp.Message = "成功通过脚本"
+	h.resp.Message = "成功通过链接"
 	h.resp.Data = res
 	h.resp.Data = data
 }
 
-/***
-func (h *AcceptLinkHandler) run() {
-	data := http_model.AcceptLinkRequest{}
-	data = *h.req
-	isRefuse := data.IsRefuse
-	if isRefuse== 0 {
-		fmt.Println("Create in")
-		res, err := service.Project.Create(h.ctx, data)
-		if err != nil {
-			logrus.Errorf("[AcceptLinkHandler] call Create err:%+v\n", err)
-			util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, "")
-			log.Info("CreateProject fail,req:%+v", h.req)
-			return
-		}
-		h.resp.Message = "成功添加修改意见"
-		h.resp.Data = res
-	} else {
-		res, err := service.Logistics.Update(h.ctx, data)
-		if err != nil {
-			logrus.Errorf("[AcceptLinkHandler] call Create err:%+v\n", err)
-			util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, "")
-			log.Info("CreateProject fail,req:%+v", h.req)
-			return
-		}
-		h.resp.Message = "成功修改物流信息"
-		h.resp.Data = res
-	}
-
-}
-***/
 func (h *AcceptLinkHandler) checkParam() error {
 	return nil
 }

handler/accept_script.go

@@ -1,13 +1,14 @@
 package handler
 
 import (
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
-	log "github.com/sirupsen/logrus"
 	"youngee_b_api/consts"
 	"youngee_b_api/model/http_model"
 	"youngee_b_api/service"
 	"youngee_b_api/util"
+
+	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 func WrapAcceptScriptHandler(ctx *gin.Context) {

handler/task_data_list.go

@@ -62,10 +62,10 @@ func (h *TaskDataListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
-	// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	// 	errs = append(errs, err)
-	// }
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DataStatus = util.IsNull(h.req.DataStatus)
 	if _, err := conv.Int64(h.req.DataStatus); err != nil {
 		errs = append(errs, err)

handler/task_default_data_list.go

@@ -62,6 +62,10 @@ func (h *TaskDefaultDataListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DefaultStatus = util.IsNull(h.req.DefaultStatus)
 	if _, err := conv.Int64(h.req.DefaultStatus); err != nil {
 		errs = append(errs, err)

handler/task_default_review_list.go

@@ -62,6 +62,10 @@ func (h *TaskDefaultReviewListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DefaultStatus = util.IsNull(h.req.DefaultStatus)
 	if _, err := conv.Int64(h.req.DefaultStatus); err != nil {
 		errs = append(errs, err)

handler/task_link_list.go

@@ -62,10 +62,10 @@ func (h *TaskLinkListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
-	// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	// 	errs = append(errs, err)
-	// }
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.LinkStatus = util.IsNull(h.req.LinkStatus)
 	if _, err := conv.Int64(h.req.LinkStatus); err != nil {
 		errs = append(errs, err)

handler/task_logistics_list.go

@@ -62,10 +62,10 @@ func (h *TaskLogisticsListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
-	// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	// 	errs = append(errs, err)
-	// }
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.LogisticsStatus = util.IsNull(h.req.LogisticsStatus)
 	if _, err := conv.Int64(h.req.LogisticsStatus); err != nil {
 		errs = append(errs, err)

handler/task_script_list.go

@@ -62,10 +62,10 @@ func (h *TaskScriptListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
-	// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	// 	errs = append(errs, err)
-	// }
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.ScriptStatus = util.IsNull(h.req.ScriptStatus)
 	if _, err := conv.Int64(h.req.ScriptStatus); err != nil {
 		errs = append(errs, err)

handler/task_sketch_list.go

@@ -62,10 +62,10 @@ func (h *TaskSketchListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
-	// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	// 	errs = append(errs, err)
-	// }
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.SketchStatus = util.IsNull(h.req.SketchStatus)
 	if _, err := conv.Int64(h.req.SketchStatus); err != nil {
 		errs = append(errs, err)

handler/task_terminated_list.go

@@ -62,6 +62,10 @@ func (h *TaskTerminatedListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DefaultStatus = util.IsNull(h.req.DefaultStatus)
 	if _, err := conv.Int64(h.req.DefaultStatus); err != nil {
 		errs = append(errs, err)

handler/task_terminating_list.go

@@ -62,6 +62,10 @@ func (h *TaskTerminatingListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DefaultStatus = util.IsNull(h.req.DefaultStatus)
 	if _, err := conv.Int64(h.req.DefaultStatus); err != nil {
 		errs = append(errs, err)

model/common_model/talent_condition.go

@@ -8,7 +8,7 @@ type TalentConditions struct {
 	LinkStatus       int64  `condition:"link_status"`       // 链接状态
 	DataStatus       int64  `condition:"data_status"`       // 数据状态
 	DefaultStatus    int64  `condition:"default_status"`    // 违约状态
-	StrategyIds      string `condition:"strategy_ids"`      // 策略ID
+	StrategyId       int64  `condition:"strategy_id"`       // 策略ID
 	TaskId           string `condition:"task_id"`           // 任务ID
 	PlatformNickname string `condition:"platform_nickname"` // 账号昵称
 }

model/http_model/project_taskList.go

@@ -2,7 +2,6 @@ package http_model
 
 import (
 	"time"
-	"youngee_b_api/model/gorm_model"
 )
 
 type ProjectTaskListRequest struct {
@@ -21,6 +20,7 @@ type ProjectTaskPreview struct {
 	FansCount          string `json:"fans_count"`            // 粉丝数
 	HomePageCaptureUrl string `json:"home_page_capture_url"` // 主页截图链接
 	StrategyId         string `json:"strategy_id"`           // 报名选择的招募策略id
+	AllPayment         string `json:"all_payment"`           // 企业支付
 	TaskReward         string `json:"task_reward"`           // 任务奖励金额
 	HomePageUrl        string `json:"home_page_url"`         // 主页链接
 	TaskStatus         string `json:"task_status"`           // 任务状态
@@ -30,20 +30,16 @@ type ProjectTaskPreview struct {
 type ProjectTaskInfo struct {
 	TaskID             int       `json:"task_id"`               // 任务id
 	PlatformNickname   string    `json:"platform_nickname"`     // 在平台上的昵称
-	FansCount          int64     `json:"fans_count"`            // 粉丝数
+	FansCount          string    `json:"fans_count"`            // 粉丝数
 	HomePageCaptureUrl string    `json:"home_page_capture_url"` // 主页截图链接
 	StrategyID         int       `json:"strategy_id"`           // 报名选择的招募策略id
+	AllPayment         float64   `json:"all_payment"`           // 企业支付
 	TaskReward         float64   `json:"task_reward"`           // 任务奖励金额
 	HomePageUrl        string    `json:"home_page_url"`         // 主页链接
 	TaskStatus         string    `json:"task_status"`           // 任务状态 1待选 2已选 3落选
 	CreateDate         time.Time `json:"create_date"`           // 创建时间
 }
 
-type TaskAccount struct {
-	Task    gorm_model.YoungeeTaskInfo
-	Account gorm_model.YoungeePlatformAccountInfo
-}
-
 type ProjectTaskListData struct {
 	ProjectTaskPreview []*ProjectTaskPreview `json:"project_task_pre_view"`
 	Total              string                `json:"total"`

model/http_model/task_data.go

@@ -10,7 +10,7 @@ type TaskDataListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DataStatus       string `json:"data_status"`       // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }
@@ -29,7 +29,7 @@ type TaskDataPreview struct {
 	PhotoUrl          string  `json:"photo_url"`           // 数据截图url
 	AllPayment        float64 `json:"all_payment"`         // 企业支付
 	RealPayment       float64 `json:"real_payment"`        // 企业实际支付（扣除违约扣款）
-	Submit            string  `json:"submit_at"`           // 提交时间
+	SubmitAt          string  `json:"submit_at"`           // 提交时间
 	AgreeAt           string  `json:"agree_at"`            // 同意时间
 	ReviseOpinion     string  `json:"revise_opinion"`      // 审稿意见
 }

model/http_model/task_default_data.go

@@ -10,7 +10,7 @@ type TaskDefaultDataListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DefaultStatus    string `json:"default_status"`    // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_default_review.go

@@ -10,7 +10,7 @@ type TaskDefaultReviewListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DefaultStatus    string `json:"default_status"`    // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_finish.go

@@ -10,7 +10,7 @@ type TaskFinishListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DataStatus       string `json:"data_status"`       // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_link.go

@@ -10,7 +10,7 @@ type TaskLinkListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	LinkStatus       string `json:"link_status"`       // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_script.go

@@ -10,7 +10,7 @@ type TaskScriptListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	ScriptStatus     string `json:"script_status"`     // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_sketch.go

@@ -10,7 +10,7 @@ type TaskSketchListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	SketchStatus     string `json:"sketch_status"`     // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_terminated.go

@@ -10,7 +10,7 @@ type TaskTerminatedListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DefaultStatus    string `json:"default_status"`    // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_terminating.go

@@ -10,7 +10,7 @@ type TaskTerminatingListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DefaultStatus    string `json:"default_status"`    // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

pack/project_task_list.go

@@ -2,9 +2,11 @@ package pack
 
 import (
 	"fmt"
+	"youngee_b_api/model/gorm_model"
 	"youngee_b_api/model/http_model"
 
 	"github.com/issue9/conv"
+	"github.com/tidwall/gjson"
 )
 
 func MGormProjectTaskToHttpProjectTaskPreview(gormProjectTaskInfos []*http_model.ProjectTaskInfo) []*http_model.ProjectTaskPreview {
@@ -25,6 +27,7 @@ func GormFullProjectToHttpProjectTaskPreview(projectTaskInfo *http_model.Project
 		FansCount:          conv.MustString(projectTaskInfo.FansCount),
 		HomePageCaptureUrl: conv.MustString(projectTaskInfo.HomePageCaptureUrl),
 		StrategyId:         conv.MustString(projectTaskInfo.StrategyID),
+		AllPayment:         conv.MustString(projectTaskInfo.AllPayment),
 		TaskReward:         conv.MustString(projectTaskInfo.TaskReward),
 		HomePageUrl:        conv.MustString(projectTaskInfo.HomePageUrl),
 		TaskStatus:         conv.MustString(projectTaskInfo.TaskStatus),
@@ -32,7 +35,7 @@ func GormFullProjectToHttpProjectTaskPreview(projectTaskInfo *http_model.Project
 	}
 }
 
-func TaskAccountToTaskInfo(taskAccounts []*http_model.TaskAccount) []*http_model.ProjectTaskInfo {
+func TaskAccountToTaskInfo(taskAccounts []gorm_model.YoungeeTaskInfo) []*http_model.ProjectTaskInfo {
 	var projectTasks []*http_model.ProjectTaskInfo
 	for _, taskAccount := range taskAccounts {
 		projectTask := GetTaskInfoStruct(taskAccount)
@@ -41,17 +44,19 @@ func TaskAccountToTaskInfo(taskAccounts []*http_model.TaskAccount) []*http_model
 	return projectTasks
 }
 
-func GetTaskInfoStruct(taskAccount *http_model.TaskAccount) *http_model.ProjectTaskInfo {
+func GetTaskInfoStruct(taskAccount gorm_model.YoungeeTaskInfo) *http_model.ProjectTaskInfo {
+	TalentPlatformInfoSnap := taskAccount.TalentPlatformInfoSnap
 	fmt.Printf("任务-账户关联 %+v", taskAccount)
 	return &http_model.ProjectTaskInfo{
-		TaskID:             taskAccount.Task.TaskID,
-		TaskReward:         taskAccount.Task.TaskReward,
-		PlatformNickname:   taskAccount.Account.PlatformNickname,
-		CreateDate:         taskAccount.Task.CreateDate,
-		HomePageUrl:        taskAccount.Account.HomePageUrl,
-		HomePageCaptureUrl: taskAccount.Account.HomePageCaptureUrl,
-		FansCount:          taskAccount.Account.FansCount,
-		TaskStatus:         string(rune(taskAccount.Task.TaskStatus)),
-		StrategyID:         taskAccount.Task.StrategyID,
+		TaskID:             taskAccount.TaskID,
+		TaskReward:         taskAccount.TaskReward,
+		AllPayment:         taskAccount.AllPayment,
+		PlatformNickname:   conv.MustString(gjson.Get(TalentPlatformInfoSnap, "platform_nickname")),
+		CreateDate:         taskAccount.CreateDate,
+		HomePageUrl:        conv.MustString(gjson.Get(TalentPlatformInfoSnap, "home_page_url")),
+		HomePageCaptureUrl: conv.MustString(gjson.Get(TalentPlatformInfoSnap, "home_page_capture_url")),
+		FansCount:          conv.MustString(gjson.Get(TalentPlatformInfoSnap, "fans_count")),
+		TaskStatus:         string(rune(taskAccount.TaskStatus)),
+		StrategyID:         taskAccount.StrategyID,
 	}
 }

pack/task_data_list.go

@@ -35,7 +35,7 @@ func MGormTaskDataInfoToHttpTaskDataPreview(TaskDataInfo *http_model.TaskDataInf
 		AllPayment:        TaskDataInfo.AllPayment,
 		RealPayment:       TaskDataInfo.RealPayment,
 		ReviseOpinion:     TaskDataInfo.ReviseOpinion,
-		Submit:            conv.MustString(TaskDataInfo.SubmitAt)[0:19],
+		SubmitAt:          conv.MustString(TaskDataInfo.SubmitAt)[0:19],
 		AgreeAt:           conv.MustString(TaskDataInfo.AgreeAt)[0:19],
 	}
 }

pack/task_data_list_conditions.go

@@ -11,9 +11,9 @@ import (
 func HttpTaskDataListRequestToCondition(req *http_model.TaskDataListRequest) *common_model.TalentConditions {
 	fmt.Printf("初稿转换 %+v", req)
 	return &common_model.TalentConditions{
-		ProjectId:   conv.MustInt64(req.ProjectId),
-		DataStatus:  conv.MustInt64(req.DataStatus),
-		StrategyIds: conv.MustString(req.StrategyIds),
+		ProjectId:  conv.MustInt64(req.ProjectId),
+		DataStatus: conv.MustInt64(req.DataStatus),
+		StrategyId: conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}

pack/task_default_list_conditions.go

@@ -11,7 +11,7 @@ func HttpTaskDefaultReviewListRequestToCondition(req *http_model.TaskDefaultRevi
 	return &common_model.TalentConditions{
 		ProjectId:     conv.MustInt64(req.ProjectId),
 		DefaultStatus: conv.MustInt64(req.DefaultStatus),
-		StrategyIds:   conv.MustString(req.StrategyIds),
+		StrategyId:    conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}
@@ -21,7 +21,7 @@ func HttpTaskDefaultDataListRequestToCondition(req *http_model.TaskDefaultDataLi
 	return &common_model.TalentConditions{
 		ProjectId:     conv.MustInt64(req.ProjectId),
 		DefaultStatus: conv.MustInt64(req.DefaultStatus),
-		StrategyIds:   conv.MustString(req.StrategyIds),
+		StrategyId:    conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}
@@ -31,7 +31,7 @@ func HttpTaskTerminatingListRequestToCondition(req *http_model.TaskTerminatingLi
 	return &common_model.TalentConditions{
 		ProjectId:     conv.MustInt64(req.ProjectId),
 		DefaultStatus: conv.MustInt64(req.DefaultStatus),
-		StrategyIds:   conv.MustString(req.StrategyIds),
+		StrategyId:    conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}
@@ -41,7 +41,7 @@ func HttpTaskTerminatedListRequestToCondition(req *http_model.TaskTerminatedList
 	return &common_model.TalentConditions{
 		ProjectId:     conv.MustInt64(req.ProjectId),
 		DefaultStatus: conv.MustInt64(req.DefaultStatus),
-		StrategyIds:   conv.MustString(req.StrategyIds),
+		StrategyId:    conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}

pack/task_finish_list_conditions.go

@@ -11,8 +11,8 @@ import (
 func HttpTaskFinishListRequestToCondition(req *http_model.TaskFinishListRequest) *common_model.TalentConditions {
 	fmt.Printf("初稿转换 %+v", req)
 	return &common_model.TalentConditions{
-		ProjectId:   conv.MustInt64(req.ProjectId),
-		StrategyIds: conv.MustString(req.StrategyIds),
+		ProjectId:  conv.MustInt64(req.ProjectId),
+		StrategyId: conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}

pack/task_link_list_conditions.go

@@ -11,9 +11,9 @@ import (
 func HttpTaskLinkListRequestToCondition(req *http_model.TaskLinkListRequest) *common_model.TalentConditions {
 	fmt.Printf("链接转换 %+v", req)
 	return &common_model.TalentConditions{
-		ProjectId:   conv.MustInt64(req.ProjectId),
-		LinkStatus:  conv.MustInt64(req.LinkStatus),
-		StrategyIds: conv.MustString(req.StrategyIds),
+		ProjectId:  conv.MustInt64(req.ProjectId),
+		LinkStatus: conv.MustInt64(req.LinkStatus),
+		StrategyId: conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}

pack/task_logistics_list_conditions.go

@@ -11,7 +11,7 @@ func HttpTaskLogisticsListRequestToCondition(req *http_model.TaskLogisticsListRe
 	return &common_model.TalentConditions{
 		ProjectId:       conv.MustInt64(req.ProjectId),
 		LogisticsStatus: conv.MustInt64(req.LogisticsStatus),
-		StrategyIds:     conv.MustString(req.StrategyId),
+		StrategyId:      conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}

pack/task_script_list_conditions.go

@@ -13,7 +13,7 @@ func HttpTaskScriptListRequestToCondition(req *http_model.TaskScriptListRequest)
 	return &common_model.TalentConditions{
 		ProjectId:    conv.MustInt64(req.ProjectId),
 		ScriptStatus: conv.MustInt64(req.ScriptStatus),
-		StrategyIds:  conv.MustString(req.StrategyIds),
+		StrategyId:   conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}

pack/task_sketch_list_conditions.go

@@ -13,7 +13,7 @@ func HttpTaskSketchListRequestToCondition(req *http_model.TaskSketchListRequest)
 	return &common_model.TalentConditions{
 		ProjectId:    conv.MustInt64(req.ProjectId),
 		SketchStatus: conv.MustInt64(req.SketchStatus),
-		StrategyIds:  conv.MustString(req.StrategyIds),
+		StrategyId:   conv.MustInt64(req.StrategyId),
 		// TaskId:           conv.MustString(req.TaskId),
 		PlatformNickname: conv.MustString(req.PlatformNickname),
 	}

service/logistics.go

@@ -78,12 +78,18 @@ func (*logistics) Create(ctx context.Context, newLogistics http_model.CreateLogi
 		return nil, err
 	}
 
-	// 修改task_info中发货状态
+	// 修改task_info中发货时间
 	err = db.UpdateLogisticsDate(ctx, Logistics.TaskID)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[logistics service] call UpdateLogisticsDate error,err:%+v", err)
 		return nil, err
 	}
+	// 修改task_info中任务阶段
+	err = db.UpdateTaskStageByTaskId(ctx, Logistics.TaskID, 2, 5) //修改为待传初稿
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[logistics service] call UpdateLogisticsDate error,err:%+v", err)
+		return nil, err
+	}
 
 	// 对应招募策略待发货--，已发货++
 
@@ -140,13 +146,13 @@ func (*logistics) SignForReceipt(ctx *gin.Context, data http_model.SignForReceip
 		return err3
 	}
 	if project.ContentType == 1 {
-		err := db.UpdateTaskStage(ctx, conv.MustInt64(*projectId), 2, 11)
+		err := db.UpdateTaskStageByProjectId(ctx, conv.MustInt64(*projectId), 2, 9)
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 			return err
 		}
 	} else {
-		err := db.UpdateTaskStage(ctx, conv.MustInt64(*projectId), 2, 8)
+		err := db.UpdateTaskStageByProjectId(ctx, conv.MustInt64(*projectId), 2, 7)
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 			return err

service/project_pay.go

@@ -43,20 +43,20 @@ func (*projectPay) Pay(ctx context.Context, projectPay http_model.ProjectPayRequ
 		return nil, err2
 	}
 	if project.ProjectForm != 4 {
-		err = db.UpdateTaskStage(ctx, conv.MustInt64(projectPay.ProjectID), 2, 5)
+		err = db.UpdateTaskStageByProjectId(ctx, conv.MustInt64(projectPay.ProjectID), 2, 4)
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 			return nil, err
 		}
 	} else {
 		if project.ContentType == 1 {
-			err = db.UpdateTaskStage(ctx, conv.MustInt64(projectPay.ProjectID), 2, 11) //修改为待传初稿
+			err = db.UpdateTaskStageByProjectId(ctx, conv.MustInt64(projectPay.ProjectID), 2, 9) //修改为待传初稿
 			if err != nil {
 				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 				return nil, err
 			}
 		} else {
-			err = db.UpdateTaskStage(ctx, conv.MustInt64(projectPay.ProjectID), 2, 8) //修改为待传脚本
+			err = db.UpdateTaskStageByProjectId(ctx, conv.MustInt64(projectPay.ProjectID), 2, 7) //修改为待传脚本
 			if err != nil {
 				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 				return nil, err