- miss use err: in SyncSku

business/jxstore/cms/sync.go

@@ -106,7 +106,8 @@ func (v *VendorSync) SyncSku(db *dao.DaoDB, nameID, skuID int, isForce bool, use
 		if skuID != -1 {
 			cond[model.FieldID] = skuID
 		}
-		if err := dao.GetEntitiesByKV(db, &skuList, cond, true); err == nil {
+		err := dao.GetEntitiesByKV(db, &skuList, cond, true)
+		if err == nil {
 			globals.SugarLogger.Debug(utils.Format4Output(skuList, false))
 			task := tasksch.RunTask("SyncSku", func(batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 				sku := batchItemList[0].(*model.Sku)

business/jxutils/tasksch/task.go

@@ -125,7 +125,9 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
 				}
 			end:
 				// globals.SugarLogger.Debugf("RunTask %s, put to chann chanRetVal:%v", taskName, chanRetVal)
-				task.subFinishChan <- chanRetVal
+				if task.GetStatus() < TaskStatusEndBegin {
+					task.subFinishChan <- chanRetVal
+				}
 			}()
 		}
 		for _, job := range jobList {
@@ -142,6 +144,7 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
 			if err2, ok := result.(error); ok {
 				taskResult = nil
 				taskErr = err2
+				break
 			} else if result != nil {
 				resultList := result.([]interface{})
 				taskResult = append(taskResult, resultList...)
@@ -162,8 +165,8 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
 		task.err = taskErr
 		task.result = taskResult
 		task.TerminatedAt = time.Now()
-
 		task.locker.Unlock()
+
 		globals.SugarLogger.Debugf("RunTask %s, result:%v, err:%v", taskName, taskResult, taskErr)
 
 		close(task.finishChan)