task id修改

db/data.go

@@ -58,8 +58,8 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -75,9 +75,9 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 		logrus.WithContext(ctx).Errorf("[GetProjectTalentList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	LinkMap := make(map[int]gorm_model.YounggeeLinkInfo)
+	LinkMap := make(map[string]gorm_model.YounggeeLinkInfo)
 	for _, LinkInfo := range LinkInfos {
-		LinkMap[conv.MustInt(LinkInfo.TaskID)] = LinkInfo
+		LinkMap[LinkInfo.TaskID] = LinkInfo
 	}
 
 	db2 := GetReadDB(ctx)
@@ -96,9 +96,9 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 		logrus.WithContext(ctx).Errorf("[GetProjectTalentList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	DataMap := make(map[int]gorm_model.YounggeeDataInfo)
+	DataMap := make(map[string]gorm_model.YounggeeDataInfo)
 	for _, DataInfo := range DataInfos {
-		DataMap[conv.MustInt(DataInfo.TaskID)] = DataInfo
+		DataMap[DataInfo.TaskID] = DataInfo
 	}
 	// 查询总数
 	var totalData int64
@@ -152,7 +152,7 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 }
 
 // DataOpinion 提交意见
-func DataOpinion(ctx context.Context, TaskID int, ReviseOpinion string) error {
+func DataOpinion(ctx context.Context, TaskID string, ReviseOpinion string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YounggeeDataInfo{}).Where("task_id = ? and is_review = 0", TaskID).Updates(map[string]interface{}{"revise_opinion": ReviseOpinion, "reject_at": time.Now(), "is_review": 1}).Error
 	if err != nil {
@@ -173,7 +173,7 @@ func DataOpinion(ctx context.Context, TaskID int, ReviseOpinion string) error {
 }
 
 // AcceptData 同意数据-结案
-func AcceptData(ctx context.Context, TaskIDs []int) error {
+func AcceptData(ctx context.Context, TaskIDs []string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YounggeeDataInfo{}).Where("task_id in ?  and is_review = 0", TaskIDs).Updates(map[string]interface{}{"is_ok": 1, "is_review": 1, "agree_at": time.Now()}).Error
 	if err != nil {
@@ -225,8 +225,8 @@ func GetSpecialTaskDataList(ctx context.Context, projectID string, pageSize, pag
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -242,9 +242,9 @@ func GetSpecialTaskDataList(ctx context.Context, projectID string, pageSize, pag
 		logrus.WithContext(ctx).Errorf("[GetProjectTalentList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	LinkMap := make(map[int]gorm_model.YounggeeLinkInfo)
+	LinkMap := make(map[string]gorm_model.YounggeeLinkInfo)
 	for _, LinkInfo := range LinkInfos {
-		LinkMap[conv.MustInt(LinkInfo.TaskID)] = LinkInfo
+		LinkMap[LinkInfo.TaskID] = LinkInfo
 	}
 
 	db2 := GetReadDB(ctx)
@@ -263,9 +263,9 @@ func GetSpecialTaskDataList(ctx context.Context, projectID string, pageSize, pag
 		logrus.WithContext(ctx).Errorf("[GetProjectTalentList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	DataMap := make(map[int]gorm_model.YounggeeDataInfo)
+	DataMap := make(map[string]gorm_model.YounggeeDataInfo)
 	for _, DataInfo := range DataInfos {
-		DataMap[conv.MustInt(DataInfo.TaskID)] = DataInfo
+		DataMap[DataInfo.TaskID] = DataInfo
 	}
 	// 查询总数
 	var totalData int64

db/default.go

@@ -57,8 +57,8 @@ func GetTaskDefaultReviewList(ctx context.Context, projectID string, pageSize, p
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -67,15 +67,15 @@ func GetTaskDefaultReviewList(ctx context.Context, projectID string, pageSize, p
 	db1 = db1.Debug().Model(gorm_model.YoungeeContractInfo{})
 
 	var DefaultReviewInfos []gorm_model.YoungeeContractInfo
-	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND default_status = 1", taskIds)
+	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND (default_status = 1 OR default_status = 4)", taskIds)
 	err := db1.Find(&DefaultReviewInfos).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	DefaultReviewMap := make(map[int]gorm_model.YoungeeContractInfo)
+	DefaultReviewMap := make(map[string]gorm_model.YoungeeContractInfo)
 	for _, DefaultReviewInfo := range DefaultReviewInfos {
-		DefaultReviewMap[conv.MustInt(DefaultReviewInfo.TaskID)] = DefaultReviewInfo
+		DefaultReviewMap[DefaultReviewInfo.TaskID] = DefaultReviewInfo
 	}
 	// 查询总数
 	var totalDefaultReview int64
@@ -164,8 +164,8 @@ func GetTaskDefaultDataList(ctx context.Context, projectID string, pageSize, pag
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -174,19 +174,19 @@ func GetTaskDefaultDataList(ctx context.Context, projectID string, pageSize, pag
 	db1 = db1.Debug().Model(gorm_model.YoungeeContractInfo{})
 
 	var DefaultDataInfos []gorm_model.YoungeeContractInfo
-	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND default_status = 1", taskIds)
+	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND (default_status = 1 OR default_status = 4)", taskIds)
 	err := db1.Find(&DefaultDataInfos).Error
-	DefaultDataMap := make(map[int]gorm_model.YoungeeContractInfo)
+	DefaultDataMap := make(map[string]gorm_model.YoungeeContractInfo)
 	for _, DefaultDataInfo := range DefaultDataInfos {
-		DefaultDataMap[conv.MustInt(DefaultDataInfo.TaskID)] = DefaultDataInfo
+		DefaultDataMap[DefaultDataInfo.TaskID] = DefaultDataInfo
 	}
 
 	var LinkInfos []gorm_model.YounggeeLinkInfo
 	db2 := GetReadDB(ctx)
 	db2 = db2.Model(gorm_model.YounggeeLinkInfo{}).Where("task_id IN ? AND is_ok = 1", taskIds).Find(&LinkInfos)
-	LinkMap := make(map[int]gorm_model.YounggeeLinkInfo)
+	LinkMap := make(map[string]gorm_model.YounggeeLinkInfo)
 	for _, LinkInfo := range LinkInfos {
-		LinkMap[conv.MustInt(LinkInfo.TaskID)] = LinkInfo
+		LinkMap[LinkInfo.TaskID] = LinkInfo
 	}
 
 	// 查询总数
@@ -243,7 +243,7 @@ func GetTaskDefaultDataList(ctx context.Context, projectID string, pageSize, pag
 func GetTaskTerminatingList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TalentConditions) ([]*http_model.TaskTerminatingInfo, int64, error) {
 	db := GetReadDB(ctx)
 
-	var taskIds1 []int
+	var taskIds1 []string
 	var totalTerminating int64
 	var TerminatingInfos []gorm_model.YoungeeContractInfo
 	db = db.Model(gorm_model.YoungeeContractInfo{})
@@ -252,10 +252,10 @@ func GetTaskTerminatingList(ctx context.Context, projectID string, pageSize, pag
 		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	TerminatingMap := make(map[int]gorm_model.YoungeeContractInfo)
+	TerminatingMap := make(map[string]gorm_model.YoungeeContractInfo)
 	for _, TerminatingInfo := range TerminatingInfos {
 		taskIds1 = append(taskIds1, TerminatingInfo.TaskID)
-		TerminatingMap[conv.MustInt(TerminatingInfo.TaskID)] = TerminatingInfo
+		TerminatingMap[TerminatingInfo.TaskID] = TerminatingInfo
 	}
 
 	if err := db.Count(&totalTerminating).Error; err != nil {
@@ -299,8 +299,8 @@ func GetTaskTerminatingList(ctx context.Context, projectID string, pageSize, pag
 	db1.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -387,8 +387,8 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -397,16 +397,16 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 	db1 = db1.Debug().Model(gorm_model.YoungeeContractInfo{})
 
 	var TerminatedInfos []gorm_model.YoungeeContractInfo
-	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND default_status = 1", taskIds)
+	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND (default_status = 1 OR default_status = 4)", taskIds)
 	err := db1.Find(&TerminatedInfos).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[GetTaskTerminatedList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
 
-	TerminatedMap := make(map[int]gorm_model.YoungeeContractInfo)
+	TerminatedMap := make(map[string]gorm_model.YoungeeContractInfo)
 	for _, TerminatedInfo := range TerminatedInfos {
-		TerminatedMap[conv.MustInt(TerminatedInfo.TaskID)] = TerminatedInfo
+		TerminatedMap[TerminatedInfo.TaskID] = TerminatedInfo
 	}
 	// 查询总数
 	var totalTerminated int64

db/enterprise.go

@@ -127,7 +127,7 @@ func MakeRechargeId(ctx context.Context, EnterpriseID string) string {
 		sum += 1
 	}
 	last := ""
-	rechargeIdPrefix := "8" + conv.MustString(EnterpriseID)[len(conv.MustString(EnterpriseID))-2:] + conv.MustString(sum)
+	rechargeIdPrefix := "8" + EnterpriseID[len(EnterpriseID)-2:] + conv.MustString(sum)
 	var rechargeIdLast string
 	err := db.Model(gorm_model.YounggeeRechargeRecord{}).Select("recharge_id").Where("recharge_id like ?", rechargeIdPrefix+"%").
 		Last(&rechargeIdLast).Error

db/finish.go

@@ -48,8 +48,8 @@ func GetTaskFinishList(ctx context.Context, pageSize, pageNum int64, conditions
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -60,17 +60,17 @@ func GetTaskFinishList(ctx context.Context, pageSize, pageNum int64, conditions
 	var DataInfos []gorm_model.YounggeeDataInfo
 	db1 = db1.Model(gorm_model.YounggeeDataInfo{}).Where("task_id IN ? AND is_ok = 1", taskIds)
 	err := db1.Find(&DataInfos).Error
-	DataMap := make(map[int]gorm_model.YounggeeDataInfo)
+	DataMap := make(map[string]gorm_model.YounggeeDataInfo)
 	for _, DataInfo := range DataInfos {
-		DataMap[conv.MustInt(DataInfo.TaskID)] = DataInfo
+		DataMap[DataInfo.TaskID] = DataInfo
 	}
 
 	var LinkInfos []gorm_model.YounggeeLinkInfo
 	db2 := GetReadDB(ctx)
 	db2 = db2.Model(gorm_model.YounggeeLinkInfo{}).Where("task_id IN ? AND is_ok = 1", taskIds).Find(&LinkInfos)
-	LinkMap := make(map[int]gorm_model.YounggeeLinkInfo)
+	LinkMap := make(map[string]gorm_model.YounggeeLinkInfo)
 	for _, LinkInfo := range LinkInfos {
-		LinkMap[conv.MustInt(LinkInfo.TaskID)] = LinkInfo
+		LinkMap[LinkInfo.TaskID] = LinkInfo
 	}
 
 	// 查询总数
@@ -124,7 +124,7 @@ func GetTaskFinishList(ctx context.Context, pageSize, pageNum int64, conditions
 	return newTaskFinishs, totalTask, nil
 }
 
-func GetFinishData(ctx context.Context, projectID int64) ([]*gorm_model.RecruitStrategy, error) {
+func GetFinishData(ctx context.Context, projectID string) ([]*gorm_model.RecruitStrategy, error) {
 	finishRecruitStrategy := []*gorm_model.RecruitStrategy{}
 	db := GetReadDB(ctx)
 	// 查询Task表信息
@@ -168,8 +168,8 @@ func GetSpecialTaskFinishList(ctx context.Context, pageSize, pageNum int64, cond
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -180,17 +180,17 @@ func GetSpecialTaskFinishList(ctx context.Context, pageSize, pageNum int64, cond
 	var DataInfos []gorm_model.YounggeeDataInfo
 	db1 = db1.Model(gorm_model.YounggeeDataInfo{}).Where("task_id IN ? AND is_ok = 1", taskIds)
 	err := db1.Find(&DataInfos).Error
-	DataMap := make(map[int]gorm_model.YounggeeDataInfo)
+	DataMap := make(map[string]gorm_model.YounggeeDataInfo)
 	for _, DataInfo := range DataInfos {
-		DataMap[conv.MustInt(DataInfo.TaskID)] = DataInfo
+		DataMap[DataInfo.TaskID] = DataInfo
 	}
 
 	var LinkInfos []gorm_model.YounggeeLinkInfo
 	db2 := GetReadDB(ctx)
 	db2 = db2.Model(gorm_model.YounggeeLinkInfo{}).Where("task_id IN ? AND is_ok = 1", taskIds).Find(&LinkInfos)
-	LinkMap := make(map[int]gorm_model.YounggeeLinkInfo)
+	LinkMap := make(map[string]gorm_model.YounggeeLinkInfo)
 	for _, LinkInfo := range LinkInfos {
-		LinkMap[conv.MustInt(LinkInfo.TaskID)] = LinkInfo
+		LinkMap[LinkInfo.TaskID] = LinkInfo
 	}
 
 	// 查询总数
@@ -244,7 +244,7 @@ func GetSpecialTaskFinishList(ctx context.Context, pageSize, pageNum int64, cond
 	return newTaskFinishs, totalTask, nil
 }
 
-func GetSpecialFinishDataNumber(ctx context.Context, projectId int64) (*http_model.GetSpecialFinishDataData, error) {
+func GetSpecialFinishDataNumber(ctx context.Context, projectId string) (*http_model.GetSpecialFinishDataData, error) {
 	db := GetReadDB(ctx)
 	// 查询Task表信息
 	db = db.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("task_status = 2 and task_stage = 15")
@@ -258,8 +258,8 @@ func GetSpecialFinishDataNumber(ctx context.Context, projectId int64) (*http_mod
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -274,9 +274,9 @@ func GetSpecialFinishDataNumber(ctx context.Context, projectId int64) (*http_mod
 		logrus.WithContext(ctx).Errorf("[GetSpecialFinishDataNumber] error query mysql total, err:%+v", err)
 		return nil, err
 	}
-	DataMap := make(map[int]gorm_model.YounggeeDataInfo)
+	DataMap := make(map[string]gorm_model.YounggeeDataInfo)
 	for _, DataInfo := range DataInfos {
-		DataMap[conv.MustInt(DataInfo.TaskID)] = DataInfo
+		DataMap[DataInfo.TaskID] = DataInfo
 	}
 
 	taskFinishData := http_model.GetSpecialFinishDataData{

db/link.go

@@ -57,8 +57,8 @@ func GetTaskLinkList(ctx context.Context, projectID string, pageSize, pageNum in
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -73,9 +73,9 @@ func GetTaskLinkList(ctx context.Context, projectID string, pageSize, pageNum in
 	} else {
 		db1 = db1.Where("is_ok = 1").Find(&LinkInfos)
 	}
-	LinkMap := make(map[int]gorm_model.YounggeeLinkInfo)
+	LinkMap := make(map[string]gorm_model.YounggeeLinkInfo)
 	for _, LinkInfo := range LinkInfos {
-		LinkMap[conv.MustInt(LinkInfo.TaskID)] = LinkInfo
+		LinkMap[LinkInfo.TaskID] = LinkInfo
 	}
 	// 查询总数
 	var totalLink int64
@@ -127,7 +127,7 @@ func GetTaskLinkList(ctx context.Context, projectID string, pageSize, pageNum in
 }
 
 // LinkOpinion 提交意见
-func LinkOpinion(ctx context.Context, TaskID int, ReviseOpinion string) error {
+func LinkOpinion(ctx context.Context, TaskID string, ReviseOpinion string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YounggeeLinkInfo{}).Where("task_id = ? and is_review = 0", TaskID).Updates(map[string]interface{}{"revise_opinion": ReviseOpinion, "reject_at": time.Now(), "is_review": 1}).Error
 	if err != nil {
@@ -148,7 +148,7 @@ func LinkOpinion(ctx context.Context, TaskID int, ReviseOpinion string) error {
 }
 
 // AcceptLink 同意链接
-func AcceptLink(ctx context.Context, TaskIDs []int) error {
+func AcceptLink(ctx context.Context, TaskIDs []string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YounggeeLinkInfo{}).Where("task_id in ?  and is_review = 0", TaskIDs).Updates(map[string]interface{}{"is_ok": 1, "is_review": 1, "agree_at": time.Now()}).Error
 	if err != nil {
@@ -209,8 +209,8 @@ func GetSpecialTaskLinkList(ctx context.Context, projectID string, pageSize, pag
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -225,9 +225,9 @@ func GetSpecialTaskLinkList(ctx context.Context, projectID string, pageSize, pag
 	} else {
 		db1 = db1.Where("is_ok = 1").Find(&LinkInfos)
 	}
-	LinkMap := make(map[int]gorm_model.YounggeeLinkInfo)
+	LinkMap := make(map[string]gorm_model.YounggeeLinkInfo)
 	for _, LinkInfo := range LinkInfos {
-		LinkMap[conv.MustInt(LinkInfo.TaskID)] = LinkInfo
+		LinkMap[LinkInfo.TaskID] = LinkInfo
 	}
 	// 查询总数
 	var totalLink int64

db/logistics.go

@@ -40,7 +40,7 @@ func UpdateLogistics(ctx context.Context, logistics gorm_model.YoungeeTaskLogist
 }
 
 // 更改签收时间
-func SignForReceipt(ctx context.Context, taskID int64) error {
+func SignForReceipt(ctx context.Context, taskID string) error {
 	db := GetReadDB(ctx)
 	time := time.Now()
 	err := db.Model(gorm_model.YoungeeTaskLogistics{}).Where("task_id = ?", taskID).Update("signed_time", time).Error
@@ -84,8 +84,8 @@ func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageN
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -95,9 +95,9 @@ func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageN
 
 	var logisticsInfos []gorm_model.YoungeeTaskLogistics
 	db1 = db1.Model(gorm_model.YoungeeTaskLogistics{}).Where("task_id IN ?", taskIds).Find(&logisticsInfos)
-	logisticsMap := make(map[int]gorm_model.YoungeeTaskLogistics)
+	logisticsMap := make(map[string]gorm_model.YoungeeTaskLogistics)
 	for _, logisticsInfo := range logisticsInfos {
-		logisticsMap[conv.MustInt(logisticsInfo.TaskID)] = logisticsInfo
+		logisticsMap[logisticsInfo.TaskID] = logisticsInfo
 	}
 	// 查询总数
 	var totalLogistics int64

db/number_info.go

@@ -217,7 +217,7 @@ func GetFinishNumberInfo(ctx context.Context, projectId string, strategyIds []in
 	return &FinishNumberInfoDataList, nil
 }
 
-func GetSpecialInviteNumber(ctx context.Context, projectId int64) (*http_model.GetSpecialInviteNumberData, error) {
+func GetSpecialInviteNumber(ctx context.Context, projectId string) (*http_model.GetSpecialInviteNumberData, error) {
 	var specialInviteNumberData http_model.GetSpecialInviteNumberData
 	db := GetReadDB(ctx).Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_stage != 3", projectId)
 	err := db.Where("task_status <> 2").Count(&specialInviteNumberData.UnpassNumber).Error
@@ -234,7 +234,7 @@ func GetSpecialInviteNumber(ctx context.Context, projectId int64) (*http_model.G
 	return &specialInviteNumberData, nil
 }
 
-func GetSpecialReviewNumber(ctx context.Context, projectId int64) (*http_model.GetSpecialReviewNumberData, error) {
+func GetSpecialReviewNumber(ctx context.Context, projectId string) (*http_model.GetSpecialReviewNumberData, error) {
 	var specialReviewNumber http_model.GetSpecialReviewNumberData
 	db := GetReadDB(ctx).Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and task_status = 2", projectId)
 	err := db.Where("").Count(&specialReviewNumber.ReviewNumber).Error
@@ -269,7 +269,7 @@ func GetSpecialReviewNumber(ctx context.Context, projectId int64) (*http_model.G
 	return &specialReviewNumber, nil
 }
 
-func GetSpecialLinkNumber(ctx context.Context, projectId int64) (*http_model.GetSpecialLinkNumberData, error) {
+func GetSpecialLinkNumber(ctx context.Context, projectId string) (*http_model.GetSpecialLinkNumberData, error) {
 	var specialLinkNumber http_model.GetSpecialLinkNumberData
 	db := GetReadDB(ctx).Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and task_status = 2", projectId)
 	err := db.Where("").Count(&specialLinkNumber.LinkNumber).Error
@@ -292,7 +292,7 @@ func GetSpecialLinkNumber(ctx context.Context, projectId int64) (*http_model.Get
 	return &specialLinkNumber, nil
 }
 
-func GetSpecialDataNumber(ctx context.Context, projectId int64) (*http_model.GetSpecialDataNumberData, error) {
+func GetSpecialDataNumber(ctx context.Context, projectId string) (*http_model.GetSpecialDataNumberData, error) {
 	var specialDataNumber http_model.GetSpecialDataNumberData
 	db := GetReadDB(ctx).Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and task_status = 2", projectId)
 	err := db.Where("").Count(&specialDataNumber.DataNumber).Error

db/pay_record.go

@@ -13,7 +13,7 @@ import (
 )
 
 // CreatePayRecord 新增
-func CreatePayRecord(ctx context.Context, enterpriseId string, payment float64, balance float64, payType int64, projectId int64) (*int64, error) {
+func CreatePayRecord(ctx context.Context, enterpriseId string, payment float64, balance float64, payType int64, projectId string) (*int64, error) {
 	db := GetReadDB(ctx)
 	payRecord := gorm_model.EnterprisePayRecord{
 		EnterpriseID: enterpriseId,

db/project.go

@@ -169,7 +169,7 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 			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) {
+		} else if strings.Contains(v.TaskID, platform_nickname) {
 			newTaskDatas = append(newTaskDatas, v)
 		} else {
 			totalTask--
@@ -214,7 +214,7 @@ func GetRecruitStrategys(ctx context.Context, ProjectID string) ([]gorm_model.Re
 	return RecruitStrategys, nil
 }
 
-func UpdateProjectStatus(ctx context.Context, projectId int64, status int64) error {
+func UpdateProjectStatus(ctx context.Context, projectId string, status int64) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.ProjectInfo{}).
 		Where("project_id = ?", projectId).Update("project_status", status).Error
@@ -255,33 +255,54 @@ func SetProjectFinish(ctx context.Context, projectId string) error {
 		logrus.WithContext(ctx).Errorf("[Project db] Update ProjectInfo error,err:%+v", err)
 		return err
 	}
-	// // 2. 释放企业账户因项目冻结的资金
-	// // 	1）. 计算剩余资金
-	// var allPayment float64
-	// var realPayment float64
-	// err = db9.Model(gorm_model.YoungeeTaskInfo{}).Select("sum(all_payment) as allPayment").Where("project_id = ? and task_status = 2 and task_stage >= 15", projectInfo.ProjectID).Find(&allPayment).Error
-	// if err != nil {
-	// 	log.Println("DB GetAutoCaseCloseTask error in data:", err)
-	// 	return err
-	// }
-	// err = db9.Model(gorm_model.YoungeeTaskInfo{}).Select("sum(real_payment) as realPayment").Where("project_id = ? and task_status = 2 and task_stage >= 15", projectInfo.ProjectID).Find(&realPayment).Error
-	// if err != nil {
-	// 	log.Println("DB GetAutoCaseCloseTask error in data:", err)
-	// 	return err
-	// }
-	// fmt.Println("企业应支付金额总计：", allPayment, "实际支付总计：", realPayment)
-
-	// // 	2）. 释放剩余资金
-	// err = db9.Model(gorm_model.Enterprise{}).Where("enterprise_id = ?", projectInfo.EnterpriseID).Updates(
-	// 	map[string]interface{}{
-	// 		"frozen_balance":    gorm.Expr("frozen_balance - ?", allPayment),
-	// 		"balance":           gorm.Expr("balance - ?", realPayment),
-	// 		"available_balance": gorm.Expr("available_balance + ?", allPayment-realPayment)}).Error
-	// if err != nil {
-	// 	log.Println("DB GetAutoCaseCloseTask error in data:", err)
-	// 	return err
-	// }
+	var finishedNum int64
+	var unfinishedNum int64
+	err1 := db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = 2 AND task_stage < 15", projectId).Count(&unfinishedNum).Error
+	if err1 != nil {
+		logrus.WithContext(ctx).Errorf("[Data db] Count YoungeeTaskInfo error,err:%+v", err)
+		return err1
+	}
+	db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Count(&finishedNum)
+	if unfinishedNum == 0 && finishedNum != 0 {
+		// 1. 更新项目状态为结束
+		err2 := db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates("project_status = 10").Error
+		if err2 != nil {
+			logrus.WithContext(ctx).Errorf("[Data db] Count YoungeeTaskInfo error,err:%+v", err)
+			return err2
+		}
 
+		// 2. 释放企业账户因项目冻结的资金
+		// 1） 计算剩余资金
+		db1 := GetReadDB(ctx)
+		var allPayment float64
+		var realPayment float64
+		err = db1.Model(gorm_model.YoungeeTaskInfo{}).
+			Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Pluck("COALESCE(SUM(all_payment), 0) as allPayment", &allPayment).Error
+		if err != nil {
+			log.Println("DB GetAutoCaseCloseTask error in data:", err)
+			return err
+		}
+		err = db1.Model(gorm_model.YoungeeTaskInfo{}).Select("sum(real_payment) as realPayment").
+			Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Pluck("COALESCE(SUM(real_payment), 0) as realPayment", &realPayment).Error
+		if err != nil {
+			log.Println("DB GetAutoCaseCloseTask error in data:", err)
+			return err
+		}
+		fmt.Println("企业应支付金额总计：", allPayment, "实际支付总计：", realPayment)
+		db2 := GetReadDB(ctx)
+		var enterpriseID int64
+		db2.Model(gorm_model.ProjectInfo{}).Select("enterprise_id").Where("project_id = ?", projectId).Find(&enterpriseID)
+		// 	2）. 释放剩余资金
+		err = db1.Model(gorm_model.Enterprise{}).Where("enterprise_id = ?", enterpriseID).Updates(
+			map[string]interface{}{
+				"frozen_balance":    gorm.Expr("frozen_balance - ?", allPayment),
+				"balance":           gorm.Expr("balance - ?", realPayment),
+				"available_balance": gorm.Expr("available_balance + ?", allPayment-realPayment)}).Error
+		if err != nil {
+			log.Println("DB GetAutoCaseCloseTask error in data:", err)
+			return err
+		}
+	}
 	return nil
 }
 

db/script.go

@@ -57,8 +57,8 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -73,9 +73,9 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 	} else {
 		db1 = db1.Where("is_ok = 1").Find(&ScriptInfos)
 	}
-	ScriptMap := make(map[int]gorm_model.YounggeeScriptInfo)
+	ScriptMap := make(map[string]gorm_model.YounggeeScriptInfo)
 	for _, ScriptInfo := range ScriptInfos {
-		ScriptMap[conv.MustInt(ScriptInfo.TaskID)] = ScriptInfo
+		ScriptMap[ScriptInfo.TaskID] = ScriptInfo
 	}
 	// 查询总数
 	var totalScript int64
@@ -128,7 +128,7 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 }
 
 // ScriptOpinion 提交意见
-func ScriptOpinion(ctx context.Context, TaskID int, ReviseOpinion string) error {
+func ScriptOpinion(ctx context.Context, TaskID string, ReviseOpinion string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YounggeeScriptInfo{}).Where("task_id = ? and is_review = 0", TaskID).Updates(map[string]interface{}{"revise_opinion": ReviseOpinion, "reject_at": time.Now(), "is_review": 1}).Error
 	if err != nil {
@@ -149,7 +149,7 @@ func ScriptOpinion(ctx context.Context, TaskID int, ReviseOpinion string) error
 }
 
 // AcceptScript 同意脚本
-func AcceptScript(ctx context.Context, TaskIDs []int) error {
+func AcceptScript(ctx context.Context, TaskIDs []string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YounggeeScriptInfo{}).Where("task_id in ?  and is_review = 0", TaskIDs).Updates(map[string]interface{}{"is_ok": 1, "is_review": 1, "agree_at": time.Now()}).Error
 	if err != nil {
@@ -210,8 +210,8 @@ func GetSpecialTaskScriptList(ctx context.Context, projectID string, pageSize, p
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -226,9 +226,9 @@ func GetSpecialTaskScriptList(ctx context.Context, projectID string, pageSize, p
 	} else {
 		db1 = db1.Where("is_ok = 1").Find(&ScriptInfos)
 	}
-	ScriptMap := make(map[int]gorm_model.YounggeeScriptInfo)
+	ScriptMap := make(map[string]gorm_model.YounggeeScriptInfo)
 	for _, ScriptInfo := range ScriptInfos {
-		ScriptMap[conv.MustInt(ScriptInfo.TaskID)] = ScriptInfo
+		ScriptMap[ScriptInfo.TaskID] = ScriptInfo
 	}
 	// 查询总数
 	var totalScript int64

db/sketch.go

@@ -57,8 +57,8 @@ func GetTaskSketchList(ctx context.Context, projectID string, pageSize, pageNum
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -74,9 +74,9 @@ func GetTaskSketchList(ctx context.Context, projectID string, pageSize, pageNum
 		db1 = db1.Where("is_ok = 1").Find(&SketchInfos)
 	}
 	fmt.Printf("初稿查询：%+v", SketchInfos)
-	SketchMap := make(map[int]gorm_model.YounggeeSketchInfo)
+	SketchMap := make(map[string]gorm_model.YounggeeSketchInfo)
 	for _, SketchInfo := range SketchInfos {
-		SketchMap[conv.MustInt(SketchInfo.TaskID)] = SketchInfo
+		SketchMap[SketchInfo.TaskID] = SketchInfo
 	}
 	// 查询总数
 	var totalSketch int64
@@ -130,7 +130,7 @@ func GetTaskSketchList(ctx context.Context, projectID string, pageSize, pageNum
 }
 
 // SketchOption 提交意见
-func SketchOption(ctx context.Context, TaskID int, ReviseOpinion string) error {
+func SketchOption(ctx context.Context, TaskID string, ReviseOpinion string) error {
 	db := GetReadDB(ctx)
 	fmt.Printf("初稿意见 %d %+v", TaskID, ReviseOpinion)
 	err := db.Model(gorm_model.YounggeeSketchInfo{}).Where("task_id = ? and is_review = 0", TaskID).Updates(map[string]interface{}{"revise_opinion": ReviseOpinion, "reject_at": time.Now(), "is_review": 1}).Error
@@ -152,7 +152,7 @@ func SketchOption(ctx context.Context, TaskID int, ReviseOpinion string) error {
 }
 
 // AcceptSketch 同意初稿
-func AcceptSketch(ctx context.Context, TaskIDs []int) error {
+func AcceptSketch(ctx context.Context, TaskIDs []string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YounggeeSketchInfo{}).Where("task_id in ? and is_review = 0", TaskIDs).Updates(map[string]interface{}{"is_ok": 1, "is_review": 1, "agree_at": time.Now()}).Error
 	if err != nil {
@@ -238,8 +238,8 @@ func GetSpecialTaskSketchList(ctx context.Context, projectID string, pageSize, p
 	db.Order("task_id").Find(&taskInfos)
 
 	// 查询任务id
-	var taskIds []int
-	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
+	var taskIds []string
+	taskMap := make(map[string]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
 		taskIds = append(taskIds, taskInfo.TaskID)
 		taskMap[taskInfo.TaskID] = taskInfo
@@ -255,9 +255,9 @@ func GetSpecialTaskSketchList(ctx context.Context, projectID string, pageSize, p
 		db1 = db1.Where("is_ok = 1").Find(&SketchInfos)
 	}
 	fmt.Printf("初稿查询：%+v", SketchInfos)
-	SketchMap := make(map[int]gorm_model.YounggeeSketchInfo)
+	SketchMap := make(map[string]gorm_model.YounggeeSketchInfo)
 	for _, SketchInfo := range SketchInfos {
-		SketchMap[conv.MustInt(SketchInfo.TaskID)] = SketchInfo
+		SketchMap[SketchInfo.TaskID] = SketchInfo
 	}
 	// 查询总数
 	var totalSketch int64

db/task.go

@@ -19,7 +19,7 @@ import (
 	"gorm.io/gorm"
 )
 
-func GetTaskList(ctx context.Context, projectID int64) ([]gorm_model.YoungeeTaskInfo, error) {
+func GetTaskList(ctx context.Context, projectID string) ([]gorm_model.YoungeeTaskInfo, error) {
 	db := GetReadDB(ctx)
 	tasks := []gorm_model.YoungeeTaskInfo{}
 
@@ -30,7 +30,7 @@ func GetTaskList(ctx context.Context, projectID int64) ([]gorm_model.YoungeeTask
 	return tasks, nil
 }
 
-func UpdateLogisticsStatus(ctx context.Context, taskID int64, status int64) error {
+func UpdateLogisticsStatus(ctx context.Context, taskID string, status int64) error {
 
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskID).Update("logistics_status", status).Error
@@ -41,7 +41,7 @@ func UpdateLogisticsStatus(ctx context.Context, taskID int64, status int64) erro
 	return nil
 }
 
-func UpdateLogisticsDate(ctx context.Context, taskID int64) error {
+func UpdateLogisticsDate(ctx context.Context, taskID string) error {
 
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskID).Update("delivery_date", time.Now()).Error
@@ -52,7 +52,7 @@ func UpdateLogisticsDate(ctx context.Context, taskID int64) error {
 	return nil
 }
 
-func GetProjectIdByTaskId(ctx context.Context, taskID int64) (*string, error) {
+func GetProjectIdByTaskId(ctx context.Context, taskID string) (*string, error) {
 	db := GetReadDB(ctx)
 	task := &gorm_model.YoungeeTaskInfo{}
 	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskID).Scan(task).Error
@@ -112,7 +112,7 @@ func ChangeSpecialTaskStatus(ctx context.Context, taskIds []string, taskStatus s
 	return nil
 }
 
-func UpdateTaskSelectAtByProjectId(ctx context.Context, projectID int64, taskStatus int64) error {
+func UpdateTaskSelectAtByProjectId(ctx context.Context, projectID string, taskStatus int64) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id=? and task_status = ?", projectID, taskStatus).Update("select_date", time.Now()).Error
 	if err != nil {
@@ -121,7 +121,7 @@ func UpdateTaskSelectAtByProjectId(ctx context.Context, projectID int64, taskSta
 	}
 	return nil
 }
-func UpdateTaskStageByProjectId(ctx context.Context, projectID int64, taskStatus int64, taskStage int64) error {
+func UpdateTaskStageByProjectId(ctx context.Context, projectID string, 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 {
@@ -130,7 +130,7 @@ func UpdateTaskStageByProjectId(ctx context.Context, projectID int64, taskStatus
 	}
 	return nil
 }
-func UpdateTaskStageByTaskId(ctx context.Context, taskID int64, taskStatus int64, taskStage int64) error {
+func UpdateTaskStageByTaskId(ctx context.Context, taskID string, 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 {
@@ -152,7 +152,7 @@ func GetUnfinishedTaskNumber(ctx context.Context, projectID string) (*int64, err
 }
 
 // 任务结案
-func SetTaskFinish(ctx context.Context, TaskIDs []int) error {
+func SetTaskFinish(ctx context.Context, TaskIDs []string) error {
 	db := GetReadDB(ctx)
 	// 1. 修改任务表，更新任务阶段为已结案，结案方式为正常结束，数据状态为已通过，
 	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id in ?", TaskIDs).Updates(gorm_model.YoungeeTaskInfo{DataStatus: 5, TaskStage: 15, CompleteStatus: 2}).Error
@@ -266,3 +266,23 @@ func GetSpecialTaskInviteList(ctx context.Context, projectID string, pageSize, p
 	}
 	return newTaskDatas, totalTask, nil
 }
+
+func SetTalentIncome(ctx context.Context, TaskIDs []string) error {
+	db := GetReadDB(ctx)
+	var TaskInfoList []gorm_model.YoungeeTaskInfo
+	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id in ?", TaskIDs).Scan(&TaskInfoList).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Task db] Update SetTalentIncome error,err:%+v", err)
+		return err
+	}
+	for _, taskInfo := range TaskInfoList {
+		err := db.Model(gorm_model.YoungeeTalentInfo{}).Where("id = ?", taskInfo.TalentID).Updates(map[string]interface{}{
+			"income":      gorm.Expr("income + ?", taskInfo.SettleAmount),
+			"canwithdraw": gorm.Expr("canwithdraw + ?", taskInfo.SettleAmount)}).Error
+		if err != nil {
+			logrus.WithContext(ctx).Errorf("[Task db] Update SetTalentIncome error,err:%+v", err)
+			return err
+		}
+	}
+	return nil
+}

db/task_log.go

@@ -8,7 +8,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func CreateTaskLog(ctx context.Context, taskId int64, log string) error {
+func CreateTaskLog(ctx context.Context, taskId string, log string) error {
 	db := GetReadDB(ctx)
 	taskLog := gorm_model.YounggeeTaskLog{
 		TaskID:  taskId,

db/terminate.go

@@ -9,7 +9,7 @@ import (
 )
 
 // Terminate 批量提交解约申请
-func Terminate(ctx context.Context, TaskIDs []int) error {
+func Terminate(ctx context.Context, TaskIDs []string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YoungeeContractInfo{}).Where("task_id in ?  and default_status = 1", TaskIDs).Updates(map[string]interface{}{"default_status": 3, "terminate_at": time.Now()}).Error
 	if err != nil {

model/common_model/task_conditions.go

@@ -1,7 +1,7 @@
 package common_model
 
 type TaskConditions struct {
-	ProjectId        int64  `condition:"project_id"`        // 项目ID
+	ProjectId        string `condition:"project_id"`        // 项目ID
 	TaskStatus       int64  `condition:"task_status"`       // 任务状态
 	StrategyId       int64  `condition:"strategy_id"`       // 策略ID
 	TaskId           string `condition:"task_id"`           // 任务ID

model/gorm_model/contract_info.go

@@ -7,7 +7,7 @@ import (
 
 type YoungeeContractInfo struct {
 	ContractID       int       `gorm:"column:contract_id;primary_key;AUTO_INCREMENT"` // 合约id
-	TaskID           int       `gorm:"column:task_id;NOT NULL"`                       // 任务id
+	TaskID           string       `gorm:"column:task_id;NOT NULL"`                       // 任务id
 	BreakType        int       `gorm:"column:break_type;NOT NULL"`                    // 违约类型（4类严重违约）：1（脚本）2（初稿）3（链接）4（数据）
 	SettlementAmount float64   `gorm:"column:settlement_amount;NOT NULL"`             // 应结算金额
 	BreakAt          time.Time `gorm:"column:break_at"`                               // 违约时间

model/gorm_model/data.go

@@ -1,4 +1,3 @@
-// Code generated by sql2gorm. DO NOT EDIT.
 package gorm_model
 
 import (
@@ -7,7 +6,7 @@ import (
 
 type YounggeeDataInfo struct {
 	DataID          int       `gorm:"column:data_id;primary_key;AUTO_INCREMENT"` // 脚本id
-	TaskID          int       `gorm:"column:task_id;NOT NULL"`                   // 任务id
+	TaskID          string    `gorm:"column:task_id;NOT NULL"`                   // 任务id
 	PlayNumber      int       `gorm:"column:play_number;NOT NULL"`               // 播放量/阅读量
 	LikeNumber      int       `gorm:"column:like_number;NOT NULL"`               // 点赞数
 	CommentNumber   int       `gorm:"column:comment_number;NOT NULL"`            // 评论数
@@ -28,4 +27,3 @@ type YounggeeDataInfo struct {
 func (m *YounggeeDataInfo) TableName() string {
 	return "younggee_data_info"
 }
-

model/gorm_model/link.go

@@ -1,27 +1,25 @@
 package gorm_model
 
-// Code generated by sql2gorm. DO NOT EDIT.
-
 import (
-"time"
+	"time"
 )
 
 type YounggeeLinkInfo struct {
-	LinkID  int    `gorm:"column:link_id;primary_key;AUTO_INCREMENT"` // 链接id
-	TaskID  int    `gorm:"column:task_id;NOT NULL"`                   // 任务id
-	LinkUrl string `gorm:"column:link_url;NOT NULL"`                  // 上传链接url
-	PhotoUrl        string    `gorm:"column:photo_url;NOT NULL"`           // 上传截图url
-	ReviseOpinion   string    `gorm:"column:revise_opinion"`               // 审核意见
-	IsSubmit        int       `gorm:"column:is_submit;NOT NULL"`           // 是否提交
-	IsReview        int       `gorm:"column:is_review;default:0;NOT NULL"` // 是否审核
-	IsOk            int       `gorm:"column:is_ok;NOT NULL"`               // 是否合格
-	CreateAt        time.Time `gorm:"column:create_at"`                    // 创建时间
-	SubmitAt        time.Time `gorm:"column:submit_at"`                    // 提交时间
-	AgreeAt         time.Time `gorm:"column:agree_at"`                     // 同意时间
-	RejectAt        time.Time `gorm:"column:reject_at"`                    // 驳回时间
-	AutoAgreeAt     time.Time `gorm:"column:auto_agree_at"`                // 发布审核自动处理时间
-	AutoDataBreakAt time.Time `gorm:"column:auto_data_break_at"`           // 结案违约自动处理时间
-	AutoLinkBreakAt time.Time `gorm:"column:auto_link_break_at"`           // 链接违约自动处理时间
+	LinkID          int       `gorm:"column:link_id;primary_key;AUTO_INCREMENT"` // 链接id
+	TaskID          string    `gorm:"column:task_id;NOT NULL"`                   // 任务id
+	LinkUrl         string    `gorm:"column:link_url;NOT NULL"`                  // 上传链接url
+	PhotoUrl        string    `gorm:"column:photo_url;NOT NULL"`                 // 上传截图url
+	ReviseOpinion   string    `gorm:"column:revise_opinion"`                     // 审核意见
+	IsSubmit        int       `gorm:"column:is_submit;NOT NULL"`                 // 是否提交
+	IsReview        int       `gorm:"column:is_review;default:0;NOT NULL"`       // 是否审核
+	IsOk            int       `gorm:"column:is_ok;NOT NULL"`                     // 是否合格
+	CreateAt        time.Time `gorm:"column:create_at"`                          // 创建时间
+	SubmitAt        time.Time `gorm:"column:submit_at"`                          // 提交时间
+	AgreeAt         time.Time `gorm:"column:agree_at"`                           // 同意时间
+	RejectAt        time.Time `gorm:"column:reject_at"`                          // 驳回时间
+	AutoAgreeAt     time.Time `gorm:"column:auto_agree_at"`                      // 发布审核自动处理时间
+	AutoDataBreakAt time.Time `gorm:"column:auto_data_break_at"`                 // 结案违约自动处理时间
+	AutoLinkBreakAt time.Time `gorm:"column:auto_link_break_at"`                 // 链接违约自动处理时间
 }
 
 func (m *YounggeeLinkInfo) TableName() string {

model/gorm_model/logistics.go

@@ -13,7 +13,7 @@ type YoungeeTaskLogistics struct {
 	ExplorestoreEndtime   time.Time `gorm:"column:explorestore_endtime"`                    // 线下探店-探店结束时间
 	ExplorestorePeriod    string    `gorm:"column:explorestore_period"`                     // 线下探店-探店持续时间
 	CouponCodeInformation string    `gorm:"column:coupon_code_information"`                 // 虚拟产品-券码信息
-	TaskID                int64       `gorm:"column:task_id;NOT NULL"`                        // 任务id
+	TaskID                string       `gorm:"column:task_id;NOT NULL"`                        // 任务id
 	DeliveryTime          time.Time `gorm:"column:delivery_time"`                           // 发货时间
 	ThingsType            int64       `gorm:"column:things_type;NOT NULL"`                    // 任务类型：1 实物，2：线下探店，3：虚拟产品
 	SignedTime            time.Time `gorm:"column:signed_time"`                             // 实物商品-签收时间

model/gorm_model/pay_record.go

@@ -13,7 +13,7 @@ type EnterprisePayRecord struct {
 	RechargeType int64     `gorm:"column:recharge_type"`                 // 充值方式，1表示在线交易，2表示对公转账
 	EnterpriseID string     `gorm:"column:enterprise_id;NOT NULL"`        // 企业id
 	PayAt        time.Time `gorm:"column:pay_at;NOT NULL"`               // 交易时间
-	ProjectID    int64     `gorm:"column:project_id"`                    // 支付的项目id
+	ProjectID    string     `gorm:"column:project_id"`                    // 支付的项目id
 }
 
 func (m *EnterprisePayRecord) TableName() string {

model/gorm_model/project.go

@@ -6,7 +6,7 @@ import (
 )
 
 type ProjectInfo struct {
-	ProjectID         string      `gorm:"column:project_id;primary_key;AUTO_INCREMENT"` // 项目id 项目ID生成规则:年(2位)+一年中的第几天(3位)+5位数随机数，雪花算法也可，生成10位订单号
+	ProjectID         string      `gorm:"column:project_id;primary_key;"` // 项目id 项目ID生成规则:年(2位)+一年中的第几天(3位)+5位数随机数，雪花算法也可，生成10位订单号
 	ProjectName       string     `gorm:"column:project_name"`                          // 项目名称
 	ProjectStatus     int64      `gorm:"column:project_status"`                        // 项目状态，1-10分别代表创建中、待审核、审核通过、招募中、招募完毕、待支付、已支付、失效、执行中、已结案
 	ProjectType       int64      `gorm:"column:project_type"`                          // 项目类型，1代表全流程项目，2代表专项项目

model/gorm_model/project_task.go

@@ -1,4 +1,3 @@
-// Code generated by sql2gorm. DO NOT EDIT.
 package gorm_model
 
 import (
@@ -6,44 +5,43 @@ import (
 )
 
 type YoungeeTaskInfo struct {
-	TaskID                 int       `gorm:"column:task_id;primary_key;AUTO_INCREMENT"`             // 任务id
-	ProjectID              string       `gorm:"column:project_id;NOT NULL"`                            // 项目id
-	TalentID               string    `gorm:"column:talent_id;NOT NULL"`                             // 达人id
-	AccountID              int       `gorm:"column:account_id;NOT NULL"`                            // 账号id
-	TalentPlatformInfoSnap string    `gorm:"column:talent_platform_info_snap;NOT NULL"`             // 达人平台信息快照
-	TalentPersonalInfoSnap string    `gorm:"column:talent_personal_info_snap;NOT NULL"`             // 达人个人信息快照
-	TalentPostAddrSnap     string    `gorm:"column:talent_post_addr_snap;NOT NULL"`                 // 收货地址快照
-	StrategyID             int       `gorm:"column:strategy_id"`                                    // 报名选择的招募策略id
-	TaskReward             float64   `gorm:"column:task_reward;NOT NULL"`                           // 达人报酬
-	SettleAmount           float64   `gorm:"column:settle_amount;NOT NULL"`                         // 达人实际所得（扣除违约扣款）
-	AllPayment             float64   `gorm:"column:all_payment;NOT NULL"`                           // 企业支付
-	RealPayment            float64   `gorm:"column:real_payment;NOT NULL"`                          // 企业实际支付（扣除违约扣款）
-	ErrBreakRate           int       `gorm:"column:err_break_rate;default:0;NOT NULL"`              // 未上传类型违约扣款比例，百分之
-	ScriptBreakRate        int       `gorm:"column:script_break_rate;default:0;NOT NULL"`           // 脚本上传超时违约扣款比例，百分之
-	SketchBreakRate        int       `gorm:"column:sketch_break_rate;default:0;NOT NULL"`           // 初稿上传超时违约扣款比例，百分之
-	LinkBreakRate          int       `gorm:"column:link_break_rate;default:0;NOT NULL"`             // 链接上传超时违约扣款比例，百分之
-	DataBreakRate          int       `gorm:"column:data_break_rate;default:0;NOT NULL"`             // 数据上传超时违约扣款比例，百分之
-	FeeForm                int       `gorm:"column:fee_form;NOT NULL"`                              // 稿费形式，1,2,3分别代表产品置换、固定稿费、自报价
-	ServiceCharge          float64   `gorm:"column:service_charge"`                                 // 服务费
-	ServiceRate            int       `gorm:"column:service_rate"`                                   // 服务费率，千分之
-	TaskStatus             int       `gorm:"column:task_status;default:1;NOT NULL"`                 // 任务状态 1待选 2已选 3落选
-	TaskStage              int       `gorm:"column:task_stage;NOT NULL"`                            // 任务阶段，详情见info_task_stage表
-	CreateDate             time.Time `gorm:"column:create_date;NOT NULL"` // 创建时间
-	SelectDate             time.Time `gorm:"column:select_date"`                                    // 反选时间
-	DeliveryDate           time.Time `gorm:"column:delivery_date"`                                  // 发货时间
-	CompleteStatus         int       `gorm:"column:complete_status;default:1;NOT NULL"`             // 结束方式 1未结束 2正常结束 3反选失败 4被解约
-	CompleteDate           time.Time `gorm:"column:complete_date"`                                  // 结束时间
-	LogisticsStatus        int       `gorm:"column:logistics_status;default:1"`                     // 发货状态 1 待发货 2已发货 3 已签收
-	ScriptStatus           uint      `gorm:"column:script_status;default:1"`                        // 脚本上传状态 1-5分别代表待添加、已添加、待修改、已修改、已通过
-	SketchStatus           uint      `gorm:"column:sketch_status;default:1"`                        // 初稿上传状态 1-5分别代表待添加、已添加、待修改、已修改、已通过
-	UpdateAt               time.Time `gorm:"column:update_at"`                                      // 更新时间
-	LinkStatus             uint      `gorm:"column:link_status;default:1"`                          // 链接上传状态 1-5分别代表待添加、已添加、待修改、已修改、已通过
-	DataStatus             uint      `gorm:"column:data_status;default:1"`                          // 数据上传状态 1-5分别代表待添加、已添加、待修改、已修改、已通过
-	CurDefaultType         int       `gorm:"column:cur_default_type"`                               // 任务当前处于的违约类型 0-8分别表示未违约、脚本超时违约、脚本未上传违约、初稿超时违约、初稿未上传违约、链接超时违约、链接未上传违约、数据超时违约、数据未上传违约
-	WithdrawStatus         int       `gorm:"column:withdraw_status;default:1"`                      // 提现状态，1-4分别代表不可提现、可提现、提现中、已提现
+	TaskID                 string    `gorm:"column:task_id;primary_key;AUTO_INCREMENT"`   // 任务id
+	ProjectID              string    `gorm:"column:project_id;NOT NULL"`                  // 项目id
+	TalentID               string    `gorm:"column:talent_id;NOT NULL"`                   // 达人id
+	AccountID              int       `gorm:"column:account_id;NOT NULL"`                  // 账号id
+	TalentPlatformInfoSnap string    `gorm:"column:talent_platform_info_snap;NOT NULL"`   // 达人平台信息快照
+	TalentPersonalInfoSnap string    `gorm:"column:talent_personal_info_snap;NOT NULL"`   // 达人个人信息快照
+	TalentPostAddrSnap     string    `gorm:"column:talent_post_addr_snap;NOT NULL"`       // 收货地址快照
+	StrategyID             int       `gorm:"column:strategy_id"`                          // 报名选择的招募策略id
+	TaskReward             float64   `gorm:"column:task_reward;NOT NULL"`                 // 达人报酬
+	SettleAmount           float64   `gorm:"column:settle_amount;NOT NULL"`               // 达人实际所得（扣除违约扣款）
+	AllPayment             float64   `gorm:"column:all_payment;NOT NULL"`                 // 企业支付
+	RealPayment            float64   `gorm:"column:real_payment;NOT NULL"`                // 企业实际支付（扣除违约扣款）
+	ErrBreakRate           int       `gorm:"column:err_break_rate;default:0;NOT NULL"`    // 未上传类型违约扣款比例，百分之
+	ScriptBreakRate        int       `gorm:"column:script_break_rate;default:0;NOT NULL"` // 脚本上传超时违约扣款比例，百分之
+	SketchBreakRate        int       `gorm:"column:sketch_break_rate;default:0;NOT NULL"` // 初稿上传超时违约扣款比例，百分之
+	LinkBreakRate          int       `gorm:"column:link_break_rate;default:0;NOT NULL"`   // 链接上传超时违约扣款比例，百分之
+	DataBreakRate          int       `gorm:"column:data_break_rate;default:0;NOT NULL"`   // 数据上传超时违约扣款比例，百分之
+	FeeForm                int       `gorm:"column:fee_form;NOT NULL"`                    // 稿费形式，1,2,3分别代表产品置换、固定稿费、自报价
+	ServiceCharge          float64   `gorm:"column:service_charge"`                       // 服务费
+	ServiceRate            int       `gorm:"column:service_rate"`                         // 服务费率，千分之
+	TaskStatus             int       `gorm:"column:task_status;default:1;NOT NULL"`       // 任务状态 1待选 2已选 3落选
+	TaskStage              int       `gorm:"column:task_stage;NOT NULL"`                  // 任务阶段，详情见info_task_stage表
+	CreateDate             time.Time `gorm:"column:create_date;NOT NULL"`                 // 创建时间
+	SelectDate             time.Time `gorm:"column:select_date"`                          // 反选时间
+	DeliveryDate           time.Time `gorm:"column:delivery_date"`                        // 发货时间
+	CompleteStatus         int       `gorm:"column:complete_status;default:1;NOT NULL"`   // 结束方式 1未结束 2正常结束 3反选失败 4被解约
+	CompleteDate           time.Time `gorm:"column:complete_date"`                        // 结束时间
+	LogisticsStatus        int       `gorm:"column:logistics_status;default:1"`           // 发货状态 1 待发货 2已发货 3 已签收
+	ScriptStatus           uint      `gorm:"column:script_status;default:1"`              // 脚本上传状态 1-5分别代表待添加、已添加、待修改、已修改、已通过
+	SketchStatus           uint      `gorm:"column:sketch_status;default:1"`              // 初稿上传状态 1-5分别代表待添加、已添加、待修改、已修改、已通过
+	UpdateAt               time.Time `gorm:"column:update_at"`                            // 更新时间
+	LinkStatus             uint      `gorm:"column:link_status;default:1"`                // 链接上传状态 1-5分别代表待添加、已添加、待修改、已修改、已通过
+	DataStatus             uint      `gorm:"column:data_status;default:1"`                // 数据上传状态 1-5分别代表待添加、已添加、待修改、已修改、已通过
+	CurDefaultType         int       `gorm:"column:cur_default_type"`                     // 任务当前处于的违约类型 0-8分别表示未违约、脚本超时违约、脚本未上传违约、初稿超时违约、初稿未上传违约、链接超时违约、链接未上传违约、数据超时违约、数据未上传违约
+	WithdrawStatus         int       `gorm:"column:withdraw_status;default:1"`            // 提现状态，1-4分别代表不可提现、可提现、提现中、已提现
 }
 
 func (m *YoungeeTaskInfo) TableName() string {
 	return "youngee_task_info"
 }
-

model/gorm_model/script.go

@@ -6,7 +6,7 @@ import (
 
 type YounggeeScriptInfo struct {
 	ScriptID      int       `gorm:"column:script_id;primary_key;AUTO_INCREMENT"` // 脚本id
-	TaskID        int       `gorm:"column:task_id;NOT NULL"`                     // 任务id
+	TaskID        string    `gorm:"column:task_id;NOT NULL"`                     // 任务id
 	Title         string    `gorm:"column:title;NOT NULL"`                       // 脚本标题
 	Content       string    `gorm:"column:content;NOT NULL"`                     // 脚本内容
 	ReviseOpinion string    `gorm:"column:revise_opinion"`                       // 审核意见

model/gorm_model/sketch.go

@@ -8,7 +8,7 @@ import (
 
 type YounggeeSketchInfo struct {
 	SketchID          int       `gorm:"column:sketch_id;primary_key;AUTO_INCREMENT"` // 初稿id
-	TaskID            int       `gorm:"column:task_id;NOT NULL"`                     // 任务id
+	TaskID            string       `gorm:"column:task_id;NOT NULL"`                     // 任务id
 	Title             string    `gorm:"column:title"`                                // 标题
 	Type              int       `gorm:"column:type"`                                 // 初稿形式，1为图片，2为视频
 	Content           string    `gorm:"column:content"`                              // 正文

model/gorm_model/task_log.go

@@ -7,7 +7,7 @@ import (
 
 type YounggeeTaskLog struct {
 	LogID   int64       `gorm:"column:log_id;primary_key;AUTO_INCREMENT"` // 任务日志id
-	TaskID  int64       `gorm:"column:task_id;NOT NULL"`                  // 任务id
+	TaskID  string       `gorm:"column:task_id;NOT NULL"`                  // 任务id
 	Content string    `gorm:"column:content;NOT NULL"`                  // 内容
 	LogAt   time.Time `gorm:"column:log_at;NOT NULL"`                   // 时间
 }

model/http_model/SpecialTaskDataList.go

@@ -32,7 +32,7 @@ type SpecialTaskDataPreview struct {
 }
 
 type SpecialTaskDataInfo struct {
-	TaskID           int       `json:"task_id"`           // 任务ID
+	TaskID           string    `json:"task_id"`           // 任务ID
 	PlatformNickname string    `json:"platform_nickname"` // 账号昵称
 	FansCount        string    `json:"fans_count"`        // 粉丝数
 	DataId           int       `json:"data_id"`           // 数据ID

model/http_model/SpecialTaskFinishDataList.go

@@ -28,7 +28,7 @@ type SpecialTaskFinishDataPreview struct {
 }
 
 type SpecialTaskFinishDataInfo struct {
-	TaskID           int       `json:"task_id"`           // 任务ID
+	TaskID           string    `json:"task_id"`           // 任务ID
 	PlatformNickname string    `json:"platform_nickname"` // 账号昵称
 	FansCount        string    `json:"fans_count"`        // 粉丝数
 	DataId           int       `json:"data_id"`           // 数据ID

model/http_model/SpecialTaskInviteList.go

@@ -27,7 +27,7 @@ type SpecialTaskInvitePreview struct {
 }
 
 type SpecialTaskInviteInfo struct {
-	TaskID             int       `json:"task_id"`               // 任务id
+	TaskID             string    `json:"task_id"`               // 任务id
 	PlatformNickname   string    `json:"platform_nickname"`     // 在平台上的昵称
 	FansCount          string    `json:"fans_count"`            // 粉丝数
 	HomePageCaptureUrl string    `json:"home_page_capture_url"` // 主页截图链接

model/http_model/SpecialTaskLinkList.go

@@ -26,7 +26,7 @@ type SpecialTaskLinkPreview struct {
 }
 
 type SpecialTaskLinkInfo struct {
-	TaskID           int       `json:"task_id"`           // 任务ID
+	TaskID           string    `json:"task_id"`           // 任务ID
 	PlatformNickname string    `json:"platform_nickname"` // 账号昵称
 	FansCount        string    `json:"fans_count"`        // 粉丝数
 	LinkId           int       `json:"link_id"`           // 链接ID

model/http_model/SpecialTaskScriptList.go

@@ -26,7 +26,7 @@ type SpecialTaskScriptPreview struct {
 }
 
 type SpecialTaskScriptInfo struct {
-	TaskID           int       `json:"task_id"`           // 任务ID
+	TaskID           string    `json:"task_id"`           // 任务ID
 	PlatformNickname string    `json:"platform_nickname"` // 账号昵称
 	FansCount        string    `json:"fans_count"`        // 粉丝数
 	ScriptId         int       `json:"script_id"`         //脚本ID

model/http_model/SpecialTaskSketchList.go

@@ -27,7 +27,7 @@ type SpecialTaskSketchPreview struct {
 }
 
 type SpecialTaskSketchInfo struct {
-	TaskID           int       `json:"task_id"`           // 任务ID
+	TaskID           string    `json:"task_id"`           // 任务ID
 	PlatformNickname string    `json:"platform_nickname"` // 账号昵称
 	FansCount        string    `json:"fans_count"`        // 粉丝数
 	SketchId         int       `json:"sketch_id"`         //初稿ID

model/http_model/data_accept.go

@@ -7,8 +7,8 @@ type AcceptDataRequest struct {
 }
 
 type AcceptDataData struct {
-	TaskIds []int `json:"taskIds"` //任务id列表
-	IsEnd   int   `json:"is_end"`  // 项目是否结案
+	TaskIds []string `json:"taskIds"` //任务id列表
+	IsEnd   int      `json:"is_end"`  // 项目是否结案
 }
 
 func NewAcceptDataRequest() *AcceptDataRequest {

model/http_model/data_opinion.go

@@ -1,12 +1,12 @@
 package http_model
 
 type DataOpinionRequest struct {
-	TaskID      int64  `json:"task_id"`      //任务-id
+	TaskID      string `json:"task_id"`      //任务-id
 	DataOpinion string `json:"Data_opinion"` //数据审核意见
 }
 
 type DataOpinionData struct {
-	TaskID int64 `json:"task_id"` // 任务ID
+	TaskID string `json:"task_id"` // 任务ID
 }
 
 func NewDataOpinionRequest() *DataOpinionRequest {

model/http_model/link_accept.go

@@ -5,7 +5,7 @@ type AcceptLinkRequest struct {
 }
 
 type AcceptLinkData struct {
-	TaskIds []int `json:"task_id_list"` //任务id列表
+	TaskIds []string `json:"task_id_list"` //任务id列表
 }
 
 func NewAcceptLinkRequest() *AcceptLinkRequest {

model/http_model/link_opinion.go

@@ -2,12 +2,12 @@ package http_model
 
 type LinkOpinionRequest struct {
 	StrategyID  int64  `json:"strategy_id"`  //招募策略id
-	TaskID      int64  `json:"task_id"`      //任务-id
+	TaskID      string `json:"task_id"`      //任务-id
 	LinkOpinion string `json:"Link_opinion"` //链接审核意见
 }
 
 type LinkOpinionData struct {
-	TaskID int64 `json:"task_id"` // 任务ID
+	TaskID string `json:"task_id"` // 任务ID
 }
 
 func NewLinkOpinionRequest() *LinkOpinionRequest {

model/http_model/logistics_create.go

@@ -11,7 +11,7 @@ type CreateLogisticsRequest struct {
 	ExplorestoreEndtime   time.Time `json:"explorestore_endtime"`    // 线下探店-探店结束时间
 	ExplorestorePeriod    string    `json:"explorestore_period"`     // 线下探店-探店持续时间
 	CouponCodeInformation string    `json:"coupon_code_information"` // 虚拟产品-券码信息
-	TaskID                int64     `json:"task_id"`                 // 任务id
+	TaskID                string    `json:"task_id"`                 // 任务id
 	DeliveryTime          string    `json:"delivery_time"`           // 发货时间
 	ThingsType            int       `json:"things_type"`             //产品类型 1：实物, 2：虚拟产品，3：线下探店
 	IsUpdate              int       `json:"is_update"`               //更新标志位 0：不更新 1：更新

model/http_model/project_show.go

@@ -48,6 +48,7 @@ type ShowProjectData struct {
 	PassAt           time.Time             `json:"pass_at"`            // 审核通过时间
 	FinishAt         time.Time             `json:"finish_at"`          // 结案时间
 	PayAt            time.Time             `json:"pay_at"`             // 支付时间
+	AutoFailAt       time.Time             `json:"auto_fail_at"`       //自动失效时间
 }
 
 type ShowProjectRequest struct {

model/http_model/project_taskList.go

@@ -28,7 +28,7 @@ type ProjectTaskPreview struct {
 }
 
 type ProjectTaskInfo struct {
-	TaskID             int       `json:"task_id"`               // 任务id
+	TaskID             string    `json:"task_id"`               // 任务id
 	PlatformNickname   string    `json:"platform_nickname"`     // 在平台上的昵称
 	FansCount          string    `json:"fans_count"`            // 粉丝数
 	HomePageCaptureUrl string    `json:"home_page_capture_url"` // 主页截图链接

model/http_model/script_accept.go

@@ -5,7 +5,7 @@ type AcceptScriptRequest struct {
 }
 
 type AcceptScriptData struct {
-	TaskIds []int `json:"task_id_list"` //任务id列表
+	TaskIds []string `json:"task_id_list"` //任务id列表
 }
 
 func NewAcceptScriptRequest() *AcceptScriptRequest {

model/http_model/script_opinion.go

@@ -2,12 +2,12 @@ package http_model
 
 type ScriptOpinionRequest struct {
 	StrategyID    int64  `json:"strategy_id"`    //招募策略id
-	TaskID        int64  `json:"task_id"`        //任务-id
+	TaskID        string `json:"task_id"`        //任务-id
 	ScriptOpinion string `json:"script_opinion"` //初稿意见
 }
 
 type ScriptOpinionData struct {
-	TaskID int64 `json:"task_id"` // 脚本ID
+	TaskID string `json:"task_id"` // 脚本ID
 }
 
 func NewScriptOpinionRequest() *ScriptOpinionRequest {

model/http_model/sketch_accept.go

@@ -5,7 +5,7 @@ type AcceptSketchRequest struct {
 }
 
 type AcceptSketchData struct {
-	TaskIds []int `json:"task_id_list"` //任务id列表
+	TaskIds []string `json:"task_id_list"` //任务id列表
 }
 
 func NewAcceptSketchRequest() *AcceptSketchRequest {

model/http_model/sketch_opinion.go

@@ -2,12 +2,12 @@ package http_model
 
 type SketchOpinionRequest struct {
 	StrategyID    int64  `json:"strategy_id"`    //招募策略id
-	TaskID        int64  `json:"task_id"`        //任务-id
+	TaskID        string `json:"task_id"`        //任务-id
 	SketchOpinion string `json:"sketch_opinion"` //初稿意见
 }
 
 type SketchOpinionData struct {
-	TaskID int64 `json:"task_id"` // 脚本ID
+	TaskID string `json:"task_id"` // 脚本ID
 }
 
 func NewSketchOpinionRequest() *SketchOpinionRequest {

model/http_model/task_data.go

@@ -35,7 +35,7 @@ type TaskDataPreview struct {
 }
 
 type TaskDataInfo struct {
-	TaskID            int       `json:"task_id"`             // 任务ID
+	TaskID            string    `json:"task_id"`             // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"`   // 账号昵称
 	FansCount         string    `json:"fans_count"`          // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"` // 招募策略ID

model/http_model/task_default_data.go

@@ -28,7 +28,7 @@ type TaskDefaultDataPreview struct {
 }
 
 type TaskDefaultDataInfo struct {
-	TaskID            int       `json:"task_id"`             // 任务ID
+	TaskID            string    `json:"task_id"`             // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"`   // 账号昵称
 	FansCount         string    `json:"fans_count"`          // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"` // 招募策略ID

model/http_model/task_default_review.go

@@ -27,7 +27,7 @@ type TaskDefaultReviewPreview struct {
 }
 
 type TaskDefaultReviewInfo struct {
-	TaskID            int       `json:"task_id"`             // 任务ID
+	TaskID            string    `json:"task_id"`             // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"`   // 账号昵称
 	FansCount         string    `json:"fans_count"`          // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"` // 招募策略ID

model/http_model/task_finish.go

@@ -32,7 +32,7 @@ type TaskFinishPreview struct {
 }
 
 type TaskFinishInfo struct {
-	TaskID            int       `json:"task_id"`             // 任务ID
+	TaskID            string    `json:"task_id"`             // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"`   // 账号昵称
 	FansCount         string    `json:"fans_count"`          // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"` // 招募策略ID

model/http_model/task_link.go

@@ -29,7 +29,7 @@ type TaskLinkPreview struct {
 }
 
 type TaskLinkInfo struct {
-	TaskID            int       `json:"task_id"`           // 任务ID
+	TaskID            string    `json:"task_id"`           // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"` // 账号昵称
 	FansCount         string    `json:"fans_count"`        // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"`

model/http_model/task_logistics.go

@@ -33,7 +33,7 @@ type TaskLogisticsPreview struct {
 }
 
 type TaskLogisticsInfo struct {
-	TaskID                int       `json:"task_id"`           // 任务ID
+	TaskID                string    `json:"task_id"`           // 任务ID
 	PlatformNickname      string    `json:"platform_nickname"` // 账号昵称
 	FansCount             string    `json:"fans_count"`        // 粉丝数
 	RecruitStrategyID     int       `json:"recruit_strategy_id"`

model/http_model/task_script.go

@@ -29,7 +29,7 @@ type TaskScriptPreview struct {
 }
 
 type TaskScriptInfo struct {
-	TaskID            int       `json:"task_id"`           // 任务ID
+	TaskID            string    `json:"task_id"`           // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"` // 账号昵称
 	FansCount         string    `json:"fans_count"`        // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"`

model/http_model/task_sketch.go

@@ -31,7 +31,7 @@ type TaskSketchPreview struct {
 }
 
 type TaskSketchInfo struct {
-	TaskID            int       `json:"task_id"`           // 任务ID
+	TaskID            string    `json:"task_id"`           // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"` // 账号昵称
 	FansCount         string    `json:"fans_count"`        // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"`

model/http_model/task_terminate.go

@@ -5,7 +5,7 @@ type TaskTerminateRequest struct {
 }
 
 type TaskTerminateData struct {
-	TaskIds []int `json:"task_id_list"` //任务id列表
+	TaskIds []string `json:"task_id_list"` //任务id列表
 }
 
 func NewTaskTerminateRequest() *TaskTerminateRequest {

model/http_model/task_terminated.go

@@ -28,7 +28,7 @@ type TaskTerminatedPreview struct {
 }
 
 type TaskTerminatedInfo struct {
-	TaskID            int       `json:"task_id"`             // 任务ID
+	TaskID            string    `json:"task_id"`             // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"`   // 账号昵称
 	FansCount         string    `json:"fans_count"`          // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"` // 招募策略ID

model/http_model/task_terminating.go

@@ -28,7 +28,7 @@ type TaskTerminatingPreview struct {
 }
 
 type TaskTerminatingInfo struct {
-	TaskID            int       `json:"task_id"`             // 任务ID
+	TaskID            string    `json:"task_id"`             // 任务ID
 	PlatformNickname  string    `json:"platform_nickname"`   // 账号昵称
 	FansCount         string    `json:"fans_count"`          // 粉丝数
 	RecruitStrategyID int       `json:"recruit_strategy_id"` // 招募策略ID

pack/project_task_list_conditions.go

@@ -9,7 +9,7 @@ import (
 
 func HttpProjectTaskRequestToCondition(req *http_model.ProjectTaskListRequest) *common_model.TaskConditions {
 	return &common_model.TaskConditions{
-		ProjectId:        conv.MustInt64(req.ProjectId),
+		ProjectId:        req.ProjectId,
 		TaskStatus:       conv.MustInt64(req.TaskStatus),
 		StrategyId:       conv.MustInt64(req.StrategyId),
 		TaskId:           conv.MustString(req.TaskId),

pack/special_task_data_list.go

@@ -19,7 +19,7 @@ func MGormSpecialTaskDataInfoListToHttpSpecialTaskDataPreviewList(gormSpecialTas
 
 func MGormSpecialTaskDataInfoToHttpSpecialTaskDataPreview(SpecialTaskDataInfo *http_model.SpecialTaskDataInfo) *http_model.SpecialTaskDataPreview {
 	return &http_model.SpecialTaskDataPreview{
-		TaskID:           conv.MustString(SpecialTaskDataInfo.TaskID),
+		TaskID:           SpecialTaskDataInfo.TaskID,
 		PlatformNickname: conv.MustString(SpecialTaskDataInfo.PlatformNickname),
 		FansCount:        conv.MustString(SpecialTaskDataInfo.FansCount),
 		PlayNumber:       SpecialTaskDataInfo.PlayNumber,

pack/special_task_finishdata_list.go

@@ -19,7 +19,7 @@ func MGormSpecialTaskFinishDataInfoListToHttpSpecialTaskFinishDataPreviewList(go
 
 func MGormSpecialTaskFinishDataInfoToHttpSpecialTaskFinishDataPreview(SpecialTaskFinishDataInfo *http_model.SpecialTaskFinishDataInfo) *http_model.SpecialTaskFinishDataPreview {
 	return &http_model.SpecialTaskFinishDataPreview{
-		TaskID:           conv.MustString(SpecialTaskFinishDataInfo.TaskID),
+		TaskID:           SpecialTaskFinishDataInfo.TaskID,
 		PlatformNickname: conv.MustString(SpecialTaskFinishDataInfo.PlatformNickname),
 		FansCount:        conv.MustString(SpecialTaskFinishDataInfo.FansCount),
 		PlayNumber:       SpecialTaskFinishDataInfo.PlayNumber,

pack/special_task_invite_list.go

@@ -22,7 +22,7 @@ func GormFullProjectToHttpSpecialTaskInvitePreview(projectTaskInfo *http_model.S
 	createDate := conv.MustString(projectTaskInfo.CreateDate)
 	createDate = createDate[0:19]
 	return &http_model.SpecialTaskInvitePreview{
-		TaskId:             conv.MustString(projectTaskInfo.TaskID),
+		TaskId:             projectTaskInfo.TaskID,
 		PlatformNickname:   conv.MustString(projectTaskInfo.PlatformNickname),
 		FansCount:          conv.MustString(projectTaskInfo.FansCount),
 		HomePageCaptureUrl: conv.MustString(projectTaskInfo.HomePageCaptureUrl),

pack/special_task_link_list.go

@@ -19,7 +19,7 @@ func MGormSpecialTaskLinkInfoListToHttpSpecialTaskLinkPreviewList(gormSpecialTas
 
 func MGormSpecialTaskLinkInfoToHttpSpecialTaskLinkPreview(SpecialTaskLinkInfo *http_model.SpecialTaskLinkInfo) *http_model.SpecialTaskLinkPreview {
 	return &http_model.SpecialTaskLinkPreview{
-		TaskID:           conv.MustString(SpecialTaskLinkInfo.TaskID),
+		TaskID:           SpecialTaskLinkInfo.TaskID,
 		PlatformNickname: conv.MustString(SpecialTaskLinkInfo.PlatformNickname),
 		FansCount:        conv.MustString(SpecialTaskLinkInfo.FansCount),
 		PhotoUrl:         SpecialTaskLinkInfo.PhotoUrl,

pack/special_task_script_list.go

@@ -19,7 +19,7 @@ func MGormSpecialTaskScriptInfoListToHttpSpecialTaskScriptPreviewList(gormSpecia
 
 func MGormSpecialTaskScriptInfoToHttpSpecialTaskScriptPreview(SpecialTaskScriptInfo *http_model.SpecialTaskScriptInfo) *http_model.SpecialTaskScriptPreview {
 	return &http_model.SpecialTaskScriptPreview{
-		TaskID:           conv.MustString(SpecialTaskScriptInfo.TaskID),
+		TaskID:           SpecialTaskScriptInfo.TaskID,
 		PlatformNickname: conv.MustString(SpecialTaskScriptInfo.PlatformNickname),
 		FansCount:        conv.MustString(SpecialTaskScriptInfo.FansCount),
 		Title:            SpecialTaskScriptInfo.Title,

pack/special_task_sketch_list.go

@@ -18,7 +18,7 @@ func MGormSpecialTaskSketchInfoListToHttpSpecialTaskSketchPreviewList(gormSpecia
 
 func MGormSpecialTaskSketchInfoToHttpSpecialTaskSketchPreview(SpecialTaskSketchInfo *http_model.SpecialTaskSketchInfo) *http_model.SpecialTaskSketchPreview {
 	return &http_model.SpecialTaskSketchPreview{
-		TaskID:           conv.MustString(SpecialTaskSketchInfo.TaskID),
+		TaskID:           SpecialTaskSketchInfo.TaskID,
 		SketchID:         conv.MustString(SpecialTaskSketchInfo.SketchId),
 		PlatformNickname: conv.MustString(SpecialTaskSketchInfo.PlatformNickname),
 		FansCount:        conv.MustString(SpecialTaskSketchInfo.FansCount),

pack/task_logistics_list.go

@@ -21,7 +21,7 @@ func MGormTaskLogisticsInfoToHttpTaskLogisticsPreview(TaskLogisticsInfo *http_mo
 	deliveryTime := conv.MustString(TaskLogisticsInfo.DeliveryTime)[0:19]
 	signedTime := conv.MustString(TaskLogisticsInfo.SignedTime)[0:19]
 	return &http_model.TaskLogisticsPreview{
-		TaskID:                conv.MustString(TaskLogisticsInfo.TaskID),
+		TaskID:                TaskLogisticsInfo.TaskID,
 		PlatformNickname:      conv.MustString(TaskLogisticsInfo.PlatformNickname),
 		FansCount:             conv.MustString(TaskLogisticsInfo.FansCount),
 		RecruitStrategyID:     conv.MustString(TaskLogisticsInfo.RecruitStrategyID),

pack/task_sketch_list.go

@@ -21,7 +21,7 @@ func MGormTaskSketchInfoToHttpTaskSketchPreview(TaskSketchInfo *http_model.TaskS
 	//deliveryTime := conv.MustString(TaskSketchInfo.DeliveryTime)
 	//deliveryTime = deliveryTime[0:19]
 	return &http_model.TaskSketchPreview{
-		TaskID:            conv.MustString(TaskSketchInfo.TaskID),
+		TaskID:            TaskSketchInfo.TaskID,
 		SketchID:          conv.MustString(TaskSketchInfo.SketchId),
 		PlatformNickname:  conv.MustString(TaskSketchInfo.PlatformNickname),
 		FansCount:         conv.MustString(TaskSketchInfo.FansCount),

service/data.go

@@ -8,7 +8,6 @@ import (
 	"youngee_b_api/model/gorm_model"
 	"youngee_b_api/model/http_model"
 
-	"github.com/issue9/conv"
 	"github.com/sirupsen/logrus"
 )
 
@@ -20,7 +19,7 @@ type data struct {
 // DataOpinion 在上传脚本表上提交修改意见
 func (*data) DataOpinion(ctx context.Context, request http_model.DataOpinionRequest) (*http_model.DataOpinionData, error) {
 	Data := gorm_model.YounggeeDataInfo{
-		TaskID:        conv.MustInt(request.TaskID),
+		TaskID:        request.TaskID,
 		ReviseOpinion: request.DataOpinion,
 	}
 	err := db.DataOpinion(ctx, Data.TaskID, Data.ReviseOpinion)
@@ -29,24 +28,24 @@ func (*data) DataOpinion(ctx context.Context, request http_model.DataOpinionRequ
 		return nil, err
 	}
 	// 记录任务日志
-	err = db.CreateTaskLog(ctx, int64(Data.TaskID), "数据驳回")
+	err = db.CreateTaskLog(ctx, Data.TaskID, "数据驳回")
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Link service] call CreateTaskLog error,err:%+v", err)
 		return nil, err
 	}
 
 	res := &http_model.DataOpinionData{
-		TaskID: int64(Data.TaskID),
+		TaskID: Data.TaskID,
 	}
 	return res, nil
 }
 
 // 任务结案service
 func (*data) AcceptData(ctx context.Context, request http_model.AcceptDataRequest) (*http_model.AcceptDataData, error) {
-	var TaskIDList []int
+	var TaskIDList []string
 	TaskIDs := strings.Split(request.TaskIds, ",")
 	for _, taskId := range TaskIDs {
-		TaskIDList = append(TaskIDList, conv.MustInt(taskId))
+		TaskIDList = append(TaskIDList, taskId)
 	}
 
 	// 1. 更新YounggeeDataInfo表，通过数据
@@ -59,7 +58,7 @@ func (*data) AcceptData(ctx context.Context, request http_model.AcceptDataReques
 
 	// 记录任务日志
 	for _, taskId := range TaskIDList {
-		err = db.CreateTaskLog(ctx, int64(taskId), "数据通过")
+		err = db.CreateTaskLog(ctx, taskId, "数据通过")
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[Data service] call CreateTaskLog error,err:%+v", err)
 			return nil, err
@@ -77,7 +76,11 @@ func (*data) AcceptData(ctx context.Context, request http_model.AcceptDataReques
 		TaskIds: TaskIDList,
 		IsEnd:   0,
 	}
-
+	err = db.SetTalentIncome(ctx, TaskIDList)
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Data service] call SetTalentIncome error,err:%+v", err)
+		return nil, err
+	}
 	// 3. 判断是否全部任务已结案，若已全部结案则触发项目结案
 	// 查询task_stage<15的任务数量
 	unFinishedTaskNumber, err1 := db.GetUnfinishedTaskNumber(ctx, request.ProjectId)

service/finish.go

@@ -6,8 +6,6 @@ import (
 	"youngee_b_api/model/http_model"
 	"youngee_b_api/pack"
 
-	"github.com/issue9/conv"
-
 	"github.com/sirupsen/logrus"
 )
 
@@ -18,7 +16,7 @@ type finish struct {
 
 // FinishOpinion 在上传脚本表上提交修改意见
 func (*finish) GetFinishData(ctx context.Context, request http_model.GetFinishDataRequest) (*http_model.GetFinishData, error) {
-	finishRecruitStrategyList, err := db.GetFinishData(ctx, conv.MustInt64(request.ProjectId))
+	finishRecruitStrategyList, err := db.GetFinishData(ctx, request.ProjectId)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Finish service] call CreateFinish error,err:%+v", err)
 		return nil, err

service/link.go

@@ -8,8 +8,6 @@ import (
 	"youngee_b_api/model/gorm_model"
 	"youngee_b_api/model/http_model"
 
-	"github.com/issue9/conv"
-
 	"github.com/sirupsen/logrus"
 )
 
@@ -21,7 +19,7 @@ type link struct {
 // LinkOpinion 在上传脚本表上提交修改意见
 func (*link) LinkOpinion(ctx context.Context, request http_model.LinkOpinionRequest) (*http_model.LinkOpinionData, error) {
 	Link := gorm_model.YounggeeLinkInfo{
-		TaskID:        conv.MustInt(request.TaskID),
+		TaskID:        request.TaskID,
 		ReviseOpinion: request.LinkOpinion,
 	}
 	err := db.LinkOpinion(ctx, Link.TaskID, Link.ReviseOpinion)
@@ -30,24 +28,24 @@ func (*link) LinkOpinion(ctx context.Context, request http_model.LinkOpinionRequ
 		return nil, err
 	}
 	// 记录任务日志
-	err = db.CreateTaskLog(ctx, int64(Link.TaskID), "链接驳回")
+	err = db.CreateTaskLog(ctx, Link.TaskID, "链接驳回")
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Link service] call CreateTaskLog error,err:%+v", err)
 		return nil, err
 	}
 
 	res := &http_model.LinkOpinionData{
-		TaskID: int64(Link.TaskID),
+		TaskID: Link.TaskID,
 	}
 	return res, nil
 }
 
 // AcceptLink
 func (*link) AcceptLink(ctx context.Context, request http_model.AcceptLinkRequest) (*http_model.AcceptLinkData, error) {
-	var TaskIDList []int
+	var TaskIDList []string
 	TaskIDs := strings.Split(request.TaskIds, ",")
 	for _, taskId := range TaskIDs {
-		TaskIDList = append(TaskIDList, conv.MustInt(taskId))
+		TaskIDList = append(TaskIDList, taskId)
 	}
 	fmt.Printf("acc request %+v", TaskIDList)
 	err := db.AcceptLink(ctx, TaskIDList)
@@ -57,7 +55,7 @@ func (*link) AcceptLink(ctx context.Context, request http_model.AcceptLinkReques
 	}
 	// 记录任务日志
 	for _, taskId := range TaskIDList {
-		err = db.CreateTaskLog(ctx, int64(taskId), "链接通过")
+		err = db.CreateTaskLog(ctx, taskId, "链接通过")
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[Link service] call CreateTaskLog error,err:%+v", err)
 			return nil, err

service/logistics.go

@@ -141,7 +141,7 @@ func (*logistics) Update(ctx context.Context, newLogistics http_model.CreateLogi
 
 // 签收
 func (*logistics) SignForReceipt(ctx *gin.Context, data http_model.SignForReceiptRequest) interface{} {
-	projectId, err1 := db.GetProjectIdByTaskId(ctx, conv.MustInt64(data.TaskStrategyIds[0].TaskId))
+	projectId, err1 := db.GetProjectIdByTaskId(ctx, data.TaskStrategyIds[0].TaskId)
 	if err1 != nil {
 		logrus.WithContext(ctx).Errorf("[project service] call GetProjectIdByTaskId error,err:%+v", err1)
 		return err1
@@ -153,20 +153,20 @@ func (*logistics) SignForReceipt(ctx *gin.Context, data http_model.SignForReceip
 		return err3
 	}
 	if project.ContentType == 1 {
-		err := db.UpdateTaskStageByProjectId(ctx, conv.MustInt64(*projectId), 2, 9)
+		err := db.UpdateTaskStageByProjectId(ctx, *projectId, 2, 9)
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 			return err
 		}
 	} else {
-		err := db.UpdateTaskStageByProjectId(ctx, conv.MustInt64(*projectId), 2, 7)
+		err := db.UpdateTaskStageByProjectId(ctx, *projectId, 2, 7)
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 			return err
 		}
 	}
 	for _, value := range data.TaskStrategyIds {
-		taskId := conv.MustInt64(value.TaskId)
+		taskId := value.TaskId
 		strategyId := conv.MustInt64(value.StrategyId)
 		err := db.UpdateLogisticsStatus(ctx, taskId, 3)
 		if err != nil {

service/number_info.go

@@ -107,7 +107,7 @@ func (*number) GetLogisticsNumberInfo(ctx context.Context, request http_model.Ge
 }
 
 func (*number) GetSpecialInviteNumber(ctx context.Context, request http_model.GetSpecialInviteNumberRequest) (*http_model.GetSpecialInviteNumberData, error) {
-	projectId := conv.MustInt64(request.ProjectId)
+	projectId := request.ProjectId
 	NumberData, err := db.GetSpecialInviteNumber(ctx, projectId)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Data service] call CreateData error,err:%+v", err)
@@ -118,7 +118,7 @@ func (*number) GetSpecialInviteNumber(ctx context.Context, request http_model.Ge
 }
 
 func (*number) GetSpecialReviewNumber(ctx context.Context, request http_model.GetSpecialReviewNumberRequest) (*http_model.GetSpecialReviewNumberData, error) {
-	projectId := conv.MustInt64(request.ProjectId)
+	projectId := request.ProjectId
 	NumberData, err := db.GetSpecialReviewNumber(ctx, projectId)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Data service] call CreateData error,err:%+v", err)
@@ -129,7 +129,7 @@ func (*number) GetSpecialReviewNumber(ctx context.Context, request http_model.Ge
 }
 
 func (*number) GetSpecialLinkNumber(ctx context.Context, request http_model.GetSpecialLinkNumberRequest) (*http_model.GetSpecialLinkNumberData, error) {
-	projectId := conv.MustInt64(request.ProjectId)
+	projectId := request.ProjectId
 	NumberData, err := db.GetSpecialLinkNumber(ctx, projectId)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Data service] call CreateData error,err:%+v", err)
@@ -140,7 +140,7 @@ func (*number) GetSpecialLinkNumber(ctx context.Context, request http_model.GetS
 }
 
 func (*number) GetSpecialDataNumber(ctx context.Context, request http_model.GetSpecialDataNumberRequest) (*http_model.GetSpecialDataNumberData, error) {
-	projectId := conv.MustInt64(request.ProjectId)
+	projectId := request.ProjectId
 	NumberData, err := db.GetSpecialDataNumber(ctx, projectId)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Data service] call CreateData error,err:%+v", err)
@@ -151,7 +151,7 @@ func (*number) GetSpecialDataNumber(ctx context.Context, request http_model.GetS
 }
 
 func (*number) GetSpecialFinishData(ctx context.Context, request http_model.GetSpecialFinishDataRequest) (*http_model.GetSpecialFinishDataData, error) {
-	projectId := conv.MustInt64(request.ProjectId)
+	projectId := request.ProjectId
 	NumberData, err := db.GetSpecialFinishDataNumber(ctx, projectId)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Data service] call CreateData error,err:%+v", err)

service/pay.go

@@ -5,8 +5,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"youngee_b_api/db"
 	"youngee_b_api/model/http_model"
-
-	"github.com/issue9/conv"
 )
 
 var Pay *pay
@@ -18,7 +16,7 @@ func (*pay) GetPaysum(ctx context.Context, project http_model.PaySumRequest) (*h
 	//select　* from　taskinfo where project_id = project.project_id => []task
 	//map int float
 	//for t in task:
-	projectId := conv.MustInt64(project.ProjectId)
+	projectId := project.ProjectId
 	tasks, err := db.GetTaskList(ctx, projectId)
 	if err != nil {
 		log.Infof("[GetPayTasklist] fail,err:%+v", err)

service/project.go

@@ -391,6 +391,7 @@ func (*project) GetPorjectDetail(ctx context.Context, projectID string) (*http_m
 		PayAt:            util.GetTimePoionter(project.PayAt),
 		ProductInfo:      conv.MustString(project.ProductSnap),
 		ProductPhotoInfo: conv.MustString(project.ProductPhotoSnap),
+		AutoFailAt:       util.GetTimePoionter(project.AutoFailAt),
 	}
 	Strategys, err := db.GetRecruitStrategys(ctx, projectID)
 	//fmt.Println("招募策略：", Strategys)

service/project_pay.go

@@ -5,7 +5,6 @@ import (
 	"youngee_b_api/db"
 	"youngee_b_api/model/http_model"
 
-	"github.com/issue9/conv"
 	"github.com/sirupsen/logrus"
 )
 
@@ -23,14 +22,14 @@ func (*projectPay) Pay(ctx context.Context, projectPay http_model.ProjectPayRequ
 	}
 
 	// 修改项目状态为执行中
-	err = db.UpdateProjectStatus(ctx, conv.MustInt64(projectPay.ProjectID), 9)
+	err = db.UpdateProjectStatus(ctx, projectPay.ProjectID, 9)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateEnterpriseBalance error,err:%+v", err)
 		return nil, err
 	}
 
 	// 插入支付记录
-	recordId, err1 := db.CreatePayRecord(ctx, enterpriseID, projectPay.PaySum, *balance, 2, conv.MustInt64(projectPay.ProjectID))
+	recordId, err1 := db.CreatePayRecord(ctx, enterpriseID, projectPay.PaySum, *balance, 2, projectPay.ProjectID)
 	if err1 != nil {
 		logrus.WithContext(ctx).Errorf("[projectPay service] call CreatePayRecord error,err:%+v", err)
 		return nil, err1
@@ -42,27 +41,27 @@ func (*projectPay) Pay(ctx context.Context, projectPay http_model.ProjectPayRequ
 		logrus.WithContext(ctx).Errorf("[project service] call GetPorjectDetail error,err:%+v", err)
 		return nil, err2
 	}
-	err = db.UpdateTaskSelectAtByProjectId(ctx, conv.MustInt64(projectPay.ProjectID), 2)
+	err = db.UpdateTaskSelectAtByProjectId(ctx, projectPay.ProjectID, 2)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 		return nil, err
 	}
 
 	if project.ProjectForm != 4 {
-		err = db.UpdateTaskStageByProjectId(ctx, conv.MustInt64(projectPay.ProjectID), 2, 4)
+		err = db.UpdateTaskStageByProjectId(ctx, 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.UpdateTaskStageByProjectId(ctx, conv.MustInt64(projectPay.ProjectID), 2, 9) //修改为待传初稿
+			err = db.UpdateTaskStageByProjectId(ctx, 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.UpdateTaskStageByProjectId(ctx, conv.MustInt64(projectPay.ProjectID), 2, 7) //修改为待传脚本
+			err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 7) //修改为待传脚本
 			if err != nil {
 				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 				return nil, err

service/script.go

@@ -8,8 +8,6 @@ import (
 	"youngee_b_api/model/gorm_model"
 	"youngee_b_api/model/http_model"
 
-	"github.com/issue9/conv"
-
 	"github.com/sirupsen/logrus"
 )
 
@@ -21,7 +19,7 @@ type script struct {
 // ScriptOpinion 在上传脚本表上提交修改意见
 func (*script) ScriptOpinion(ctx context.Context, request http_model.ScriptOpinionRequest) (*http_model.ScriptOpinionData, error) {
 	Script := gorm_model.YounggeeScriptInfo{
-		TaskID:        conv.MustInt(request.TaskID),
+		TaskID:        request.TaskID,
 		ReviseOpinion: request.ScriptOpinion,
 	}
 	err := db.ScriptOpinion(ctx, Script.TaskID, Script.ReviseOpinion)
@@ -30,24 +28,24 @@ func (*script) ScriptOpinion(ctx context.Context, request http_model.ScriptOpini
 		return nil, err
 	}
 	// 记录任务日志
-	err = db.CreateTaskLog(ctx, int64(Script.TaskID), "脚本驳回")
+	err = db.CreateTaskLog(ctx, Script.TaskID, "脚本驳回")
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Script service] call CreateTaskLog error,err:%+v", err)
 		return nil, err
 	}
 
 	res := &http_model.ScriptOpinionData{
-		TaskID: int64(Script.TaskID),
+		TaskID: Script.TaskID,
 	}
 	return res, nil
 }
 
 // AcceptScript
 func (*script) AcceptScript(ctx context.Context, request http_model.AcceptScriptRequest) (*http_model.AcceptScriptData, error) {
-	var TaskIDList []int
+	var TaskIDList []string
 	TaskIDs := strings.Split(request.TaskIds, ",")
 	for _, taskId := range TaskIDs {
-		TaskIDList = append(TaskIDList, conv.MustInt(taskId))
+		TaskIDList = append(TaskIDList, taskId)
 	}
 	fmt.Printf("acc request %+v", TaskIDList)
 	err := db.AcceptScript(ctx, TaskIDList)
@@ -57,7 +55,7 @@ func (*script) AcceptScript(ctx context.Context, request http_model.AcceptScript
 	}
 	// 记录任务日志
 	for _, taskId := range TaskIDList {
-		err = db.CreateTaskLog(ctx, int64(taskId), "脚本通过")
+		err = db.CreateTaskLog(ctx, taskId, "脚本通过")
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[Script service] call CreateTaskLog error,err:%+v", err)
 			return nil, err

service/sketch.go

@@ -21,7 +21,7 @@ type sketch struct {
 // ReviseOption 在上传初稿表上提交修改意见
 func (*sketch) SketchOption(ctx context.Context, request http_model.SketchOpinionRequest) (*http_model.SketchOpinionData, error) {
 	Sketch := gorm_model.YounggeeSketchInfo{
-		TaskID:        conv.MustInt(request.TaskID),
+		TaskID:        request.TaskID,
 		ReviseOpinion: request.SketchOpinion,
 	}
 	err := db.SketchOption(ctx, Sketch.TaskID, Sketch.ReviseOpinion)
@@ -31,23 +31,23 @@ func (*sketch) SketchOption(ctx context.Context, request http_model.SketchOpinio
 	}
 
 	// 记录任务日志
-	err = db.CreateTaskLog(ctx, int64(Sketch.TaskID), "初稿驳回")
+	err = db.CreateTaskLog(ctx, Sketch.TaskID, "初稿驳回")
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Sketch service] call CreateTaskLog error,err:%+v", err)
 		return nil, err
 	}
 	res := &http_model.SketchOpinionData{
-		TaskID: int64(Sketch.TaskID),
+		TaskID: Sketch.TaskID,
 	}
 	return res, nil
 }
 
 // AcceptSketch 同意初稿
 func (*sketch) AcceptSketch(ctx context.Context, request http_model.AcceptSketchRequest) (*http_model.AcceptSketchData, error) {
-	var TaskIDList []int
+	var TaskIDList []string
 	TaskIDs := strings.Split(request.TaskIds, ",")
 	for _, taskId := range TaskIDs {
-		TaskIDList = append(TaskIDList, conv.MustInt(taskId))
+		TaskIDList = append(TaskIDList, taskId)
 	}
 	fmt.Printf("acc request %+v", TaskIDList)
 	err := db.AcceptSketch(ctx, TaskIDList)
@@ -57,7 +57,7 @@ func (*sketch) AcceptSketch(ctx context.Context, request http_model.AcceptSketch
 	}
 	// 记录任务日志
 	for _, taskId := range TaskIDList {
-		err = db.CreateTaskLog(ctx, int64(taskId), "初稿通过")
+		err = db.CreateTaskLog(ctx, taskId, "初稿通过")
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[Sketch service] call CreateTaskLog error,err:%+v", err)
 			return nil, err

service/terminate.go

@@ -7,8 +7,6 @@ import (
 	"youngee_b_api/db"
 	"youngee_b_api/model/http_model"
 
-	"github.com/issue9/conv"
-
 	"github.com/sirupsen/logrus"
 )
 
@@ -19,10 +17,10 @@ type terminate struct {
 
 // TaskTerminate 同意初稿
 func (*terminate) TaskTerminate(ctx context.Context, request http_model.TaskTerminateRequest) (*http_model.TaskTerminateData, error) {
-	var TaskIDList []int
+	var TaskIDList []string
 	TaskIDs := strings.Split(request.TaskIds, ",")
 	for _, taskId := range TaskIDs {
-		TaskIDList = append(TaskIDList, conv.MustInt(taskId))
+		TaskIDList = append(TaskIDList, taskId)
 	}
 	fmt.Printf("acc request %+v", TaskIDList)
 	err := db.Terminate(ctx, TaskIDList)