diff --git a/business/jxutils/tasksch/task.go b/business/jxutils/tasksch/task.go index 3c038b3e8..984b13c56 100644 --- a/business/jxutils/tasksch/task.go +++ b/business/jxutils/tasksch/task.go @@ -63,7 +63,7 @@ type ITask interface { // GetDetailErrList() []error GetLeafResult() (finishedItemCount, failedItemCount int) AddBatchErr(err error) - AddErrMsg(failedList []*ErrMsg) + AddErrMsg(failedList ...interface{}) GetErrMsg() (failedList []*ErrMsg) json.Marshaler } @@ -71,7 +71,6 @@ type ErrMsg struct { SkuID int VendorSkuID string StoreID int - Status int VendorPrice int64 Err string } @@ -137,7 +136,7 @@ type BaseTask struct { ctx *jxcontext.Context isGetResultCalled bool - FailedList []*ErrMsg + FailedList []interface{} } func (s TaskList) Len() int { @@ -366,21 +365,25 @@ func (t *BaseTask) Error() (errMsg string) { } func (t *BaseTask) GetErrMsg() (failedList []*ErrMsg) { + t.locker.RLock() + defer t.locker.RUnlock() if len(t.FailedList) == 0 { return nil } if t.parent != nil { for _, v := range t.FailedList { - failedList = append(failedList, v) + failedList = append(failedList, v.(*ErrMsg)) } } return failedList } -func (t *BaseTask) AddErrMsg(failedList []*ErrMsg) { +func (t *BaseTask) AddErrMsg(failedList ...interface{}) { t.locker.Lock() defer t.locker.Unlock() - t.FailedList = append(t.FailedList, failedList...) + for _, v := range failedList { + t.FailedList = append(t.FailedList, v) + } } // func (t *BaseTask) GetDetailErrList() []error { @@ -439,7 +442,6 @@ func (t *BaseTask) run(taskHandler func()) { task.TerminatedAt = time.Now() task.locker.Unlock() task.Error() - task.GetErrMsg() globals.SugarLogger.Debugf("Task:%s, mainErr:%v, batchErrList:%v", task.Name, task.mainErr, task.batchErrList) select { diff --git a/business/partner/putils/store_sku.go b/business/partner/putils/store_sku.go index 55c96d116..e22f50ff2 100644 --- a/business/partner/putils/store_sku.go +++ b/business/partner/putils/store_sku.go @@ -246,7 +246,6 @@ func SelectStoreSkuListByFoodList(storeID int, storeSkuList []*partner.StoreSkuI SkuID: v.SkuID, VendorSkuID: v.VendorSkuID, StoreID: storeID, - Status: v.Status, VendorPrice: v.VendorPrice, Err: foodMap[v.VendorSkuID], } @@ -269,7 +268,6 @@ func SelectStoreSkuListByOpResult(storeID int, storeSkuList []*partner.StoreSkuI SkuID: v.SkuID, VendorSkuID: v.VendorSkuID, StoreID: storeID, - Status: v.Status, VendorPrice: v.VendorPrice, Err: opResultMap[utils.Str2Int64(v.VendorSkuID)], }