diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 41c48fc3e..bbd964ee1 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -630,7 +630,7 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, db *dao.DaoDB, taskN if isAsync { task.SetFinishHook(func(task tasksch.ITask) { var noticeMsg string - if len(task.GetErrMsg()) > 10 { + if len(task.GetFailedList()) > 10 { downloadURL, _, _ := WirteToExcelBySyncFailed(task) noticeMsg = fmt.Sprintf("[详情点我]path1=%s\n", downloadURL) } else { @@ -668,7 +668,7 @@ func buildErrMsg(task tasksch.ITask) (err error) { } func buildErrMsgJson(task tasksch.ITask) (resultL []*SyncErrResult) { - failedList := task.GetErrMsg() + failedList := task.GetFailedList() for _, v := range failedList { for _, vv := range v.([]*partner.StoreSkuInfoWithErr) { result := &SyncErrResult{ diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 1f26ab906..a65e65171 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -119,7 +119,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo for _, v := range failedList { v.CategoryName = catInfo.Name } - task.AddErrMsg(failedList) + task.AddFailedList(failedList) } if err == nil { if vendorID == model.VendorIDMTWM { @@ -491,7 +491,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo var failedList []*partner.StoreSkuInfoWithErr failedList, err = singleStoreHandler.DeleteStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList) if len(failedList) > 0 { - task.AddErrMsg(failedList) + task.AddFailedList(failedList) } if singleStoreHandler.IsErrSkuNotExist(err) { err = nil @@ -527,7 +527,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo failedList = append(failedList, putils.GetErrMsg2FailedSingleList(batchedStoreSkuList, err2, storeID, vendorID, "查询是否有该商品")...) } if len(failedList) > 0 { - task.AddErrMsg(failedList) + task.AddFailedList(failedList) } if err != nil { //handle error for sensitive words, if find, then insert to table sensitive_words @@ -548,7 +548,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo var failedList []*partner.StoreSkuInfoWithErr failedList, err = singleStoreHandler.UpdateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList) if len(failedList) > 0 { - task.AddErrMsg(failedList) + task.AddFailedList(failedList) } successList := putils.UnselectStoreSkuSyncListByVendorSkuIDs(batchedStoreSkuList, GetVendorSkuIDList(failedList)) if len(successList) > 0 { @@ -564,7 +564,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo var failedList []*partner.StoreSkuInfoWithErr failedList, err = storeSkuHandler.UpdateStoreSkusStock(ctx, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList) if len(failedList) > 0 { - task.AddErrMsg(failedList) + task.AddFailedList(failedList) } successList := putils.UnselectStoreSkuListByVendorSkuIDs(batchedStoreSkuList, GetVendorSkuIDList(failedList)) if k == 0 && len(successList) > 0 { @@ -588,7 +588,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo var failedList []*partner.StoreSkuInfoWithErr failedList, err = storeSkuHandler.UpdateStoreSkusStatus(ctx, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList, status) if len(failedList) > 0 { - task.AddErrMsg(failedList) + task.AddFailedList(failedList) } successList := putils.UnselectStoreSkuListByVendorSkuIDs(batchedStoreSkuList, GetVendorSkuIDList(failedList)) if len(successList) > 0 { @@ -603,7 +603,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo var failedList []*partner.StoreSkuInfoWithErr failedList, err = storeSkuHandler.UpdateStoreSkusPrice(ctx, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList) if len(failedList) > 0 { - task.AddErrMsg(failedList) + task.AddFailedList(failedList) } successList := putils.UnselectStoreSkuListByVendorSkuIDs(batchedStoreSkuList, GetVendorSkuIDList(failedList)) if len(successList) > 0 { diff --git a/business/jxutils/tasksch/task.go b/business/jxutils/tasksch/task.go index a91d3ce9a..4f10d3f8f 100644 --- a/business/jxutils/tasksch/task.go +++ b/business/jxutils/tasksch/task.go @@ -63,8 +63,8 @@ type ITask interface { // GetDetailErrList() []error GetLeafResult() (finishedItemCount, failedItemCount int) AddBatchErr(err error) - AddErrMsg(failedList ...interface{}) - GetErrMsg() (failedList []interface{}) + AddFailedList(failedList ...interface{}) + GetFailedList() (failedList []interface{}) SetFinishHook(func(task ITask)) json.Marshaler } @@ -368,18 +368,18 @@ func (t *BaseTask) SetFinishHook(hook func(task ITask)) { t.finishHook = hook } -func (t *BaseTask) GetErrMsg() (failedList []interface{}) { +func (t *BaseTask) GetFailedList() (failedList []interface{}) { t.locker.RLock() failedList = append(failedList, t.FailedList...) t.locker.RUnlock() for _, v := range t.Children { - failedList = append(failedList, v.GetErrMsg()...) + failedList = append(failedList, v.GetFailedList()...) } return failedList } -func (t *BaseTask) AddErrMsg(failedList ...interface{}) { +func (t *BaseTask) AddFailedList(failedList ...interface{}) { t.locker.Lock() defer t.locker.Unlock() t.FailedList = append(t.FailedList, failedList...)