auto_task

db/number_info.go

@@ -236,15 +236,25 @@ func SignLogistic(logisticId int64) string {
 	var taskId, projectId string
 	// var selectionId string
 	var contentType int64
+	var projectType int64
 	db.Model(gorm_model.YoungeeTaskLogistics{}).Select("task_id").Where("logistics_id = ?", logisticId).Find(&taskId)
 	// db.Model(gorm_model.YounggeeSecTaskInfo{}).Select("selection_id").Where("task_id = ?", taskId).Find(&selectionId)
 	db.Model(gorm_model.YoungeeTaskInfo{}).Select("project_id").Where("task_id = ?", taskId).Find(&projectId)
 	db.Model(gorm_model.ProjectInfo{}).Select("content_type").Where("project_id = ?", projectId).Find(&contentType)
+	db.Model(gorm_model.ProjectInfo{}).Select("project_type").Where("project_id = ?", projectId).Find(&projectType)
 	// contentType为内容形式
 	t := time.Now()
 	db.Model(gorm_model.YoungeeTaskLogistics{}).Where("logistics_id = ?", logisticId).Updates(&gorm_model.YoungeeTaskLogistics{SignedTime: &t, Status: 1})
 	db.Model(gorm_model.YounggeeSecTaskInfo{}).Where("task_id = ?", taskId).Updates(&gorm_model.YounggeeSecTaskInfo{SignedTime: t, FreeStage: 5})
 	if contentType == 1 {
+		if projectType == 2 {
+			var ProjectDetail *gorm_model.ProjectInfo
+			err := db.Where("project_id = ?", projectId).First(&ProjectDetail).Error
+			if err != nil {
+				return err.Error()
+			}
+
+		}
 		db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(&gorm_model.YoungeeTaskInfo{LogisticsStatus: 3, TaskStage: 9})
 		fmt.Printf("任务 %v 物流状态为已签收，已更新任务状态为 待传初稿\n", taskId)
 	} else {

dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17 as builder
+FROM golang:latest as builder
 
 WORKDIR /go/src/app
 
@@ -16,7 +16,7 @@ RUN go mod tidy -compat=1.17
 
 RUN go build .
 
-EXPOSE 8400
+EXPOSE 8488
 
 WORKDIR /go/src/app
 

service/auto_task.go

@@ -241,21 +241,24 @@ func AutoTask() error {
 			log.Println("GetAutoSelectionInvalidTask is running ,Time :", time.Now())
 		}
 
-		//定时任务14. 拉取快手平台达人实际销量
-		task14 := func() {
-			ctx := context.Background()
-			//筛选出所有执行中的Selection
-			selectionIds, _ := db.FindSelectionIdBySelectionStatus(ctx, 6)
-			for i := range len(selectionIds) {
-				var SelectionId string = selectionIds[i]
-				println("开始拉取快手平台达人实际销量")
-				err1 := SelectionTask.UpdateActualNumBySelectionId(ctx, SelectionId)
-				fmt.Println(err1)
-				println("完成拉取快手平台达人实际销量")
-			}
-		}
+
 
 	*/
+	//定时任务14. 拉取快手平台达人实际销量
+	task14 := func() {
+		ctx := context.Background()
+		//筛选出所有执行中的Selection
+		selectionIds, _ := db.FindSelectionIdBySelectionStatus(ctx, 6)
+		println("开始拉取快手平台达人实际销量")
+		for i := range len(selectionIds) {
+			var SelectionId string = selectionIds[i]
+			// println("开始拉取快手平台达人实际销量")
+			err1 := SelectionTask.UpdateActualNumBySelectionId(ctx, SelectionId)
+			fmt.Println(err1)
+			// println("完成拉取快手平台达人实际销量")
+		}
+		println("完成拉取快手平台达人实际销量")
+	}
 
 	//定时任务15 定时刷新AccessToken
 	task15 := func() {
@@ -326,13 +329,13 @@ func AutoTask() error {
 	*/
 
 	//定时任务
-	spec := "*/30 * * * * ?" //cron表达式，每30秒一次
+	//spec := "*/30 * * * * ?" //cron表达式，每30秒一次
 	//spec := "0 */1 * * * ?" //cron表达式，每一分钟执行一次
-	//spec := "0 0 * * * *" //每小时执行
+	spec := "0 0 * * * *" //每小时执行
 	// "0 0 12 * * ?" 每天中午12点执行
 	// 添加定时任务,
-	//_, err := crontab.AddFunc("0 0 * * * *", taskKDStatus) //每小时执行一次快递是否签收的查询
-	_, err := crontab.AddFunc("0 */1 * * * ?", taskKDStatus) //每分钟执行一次快递是否签收的查询
+	_, err := crontab.AddFunc("0 0 * * * *", taskKDStatus) //每小时执行一次快递是否签收的查询
+	//_, err := crontab.AddFunc("0 */1 * * * ?", taskKDStatus) //每分钟执行一次快递是否签收的查询
 	if err != nil {
 		return err
 	}
@@ -388,10 +391,10 @@ func AutoTask() error {
 	//if err13 != nil {
 	//	return err13
 	//}
-	//_, err14 := crontab.AddFunc(spec, task14)
-	//if err14 != nil {
-	//	return err14
-	//}
+	_, err14 := crontab.AddFunc(spec, task14)
+	if err14 != nil {
+		return err14
+	}
 	_, err15 := crontab.AddFunc(spec, task15)
 	if err15 != nil {
 		return err15