a

business/jxstore/cms/job.go

@@ -982,14 +982,18 @@ func GetJdDelivery(ctx *jxcontext.Context, status int, fromTime, toTime string,
 					}
 				}
 			}
-			if isFinished {
-				v.Status = model.OrderStatusFinished
-			} else if isDeliverying {
-				v.Status = model.OrderStatusDelivering
-			} else {
-				continue
+			dOrder := &model.DeliveryOrder{}
+			dOrder.ID = v.ID
+			if err = dao.GetEntity(db, dOrder); err == nil {
+				if isFinished {
+					dOrder.Status = model.OrderStatusFinished
+				} else if isDeliverying {
+					dOrder.Status = model.OrderStatusDelivering
+				} else {
+					continue
+				}
+				dao.UpdateEntity(db, dOrder, "Status")
 			}
-			dao.UpdateEntity(db, v, "Status")
 		}
 	}
 	return dao.GetDeliveryOrders(db, []string{ctx.GetUserID()}, statuss, utils.Str2Time(fromTime), utils.Str2Time(toTime), pageSize, offset)
@@ -1076,18 +1080,22 @@ func ResetJobTimers() {
 	task.GetID()
 }
 
-func UpdateJobSpan(ctx *jxcontext.Context, jobIDs []int, span int) (err error) {
-	var (
-		db = dao.GetDB()
-	)
-	for _, v := range jobIDs {
-		job := &model.Job{}
-		job.ID = v
-		err = dao.GetEntity(db, job)
-		if job != nil {
-			job.JobSpan = job.JobSpan | span
-			dao.UpdateEntity(db, job, "JobSpan")
-		}
-	}
+func CreateJobSpan(ctx *jxcontext.Context, jobIDs []int, endAt string, span int) (err error) {
+	// var (
+	// 	db = dao.GetDB()
+	// )
+	// task := tasksch.NewParallelTask("CreateJobSpan", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx,
+	// 	func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+	// 		jobID := batchItemList[0].(int)
+	// 		endAt2 := utils.Str2Time(endAt)
+	// 		jonSpan := &model.JobSpan{
+	// 			JobID:    jobID,
+	// 			EndAt:    &endAt2,
+	// 			SpanType: span,
+	// 		}
+	// 		return retVal, err
+	// 	}, jobIDs)
+	// tasksch.HandleTask(task, nil, true).Run()
+	// task.GetID()
 	return err
 }