liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步错误返回

Browse Source
This commit is contained in:
苏尹岚
2019-11-20 13:36:38 +08:00
parent 54778bc013
commit 1898d2932a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
business/jxutils/tasksch/task.go
View File

@@ -63,7 +63,7 @@ type ITask interface {
// GetDetailErrList() []error // GetDetailErrList() []error
GetLeafResult() (finishedItemCount, failedItemCount int) GetLeafResult() (finishedItemCount, failedItemCount int)
AddBatchErr(err error) AddBatchErr(err error)
AddErrMsg(failedList []*ErrMsg) AddErrMsg(failedList ...interface{})
GetErrMsg() (failedList []*ErrMsg) GetErrMsg() (failedList []*ErrMsg)
json.Marshaler json.Marshaler
} }
@@ -71,7 +71,6 @@ type ErrMsg struct {
SkuID int SkuID int
VendorSkuID string VendorSkuID string
StoreID int StoreID int
Status int
VendorPrice int64 VendorPrice int64
Err string Err string
} }
@@ -137,7 +136,7 @@ type BaseTask struct {
ctx *jxcontext.Context ctx *jxcontext.Context
isGetResultCalled bool isGetResultCalled bool
FailedList []*ErrMsg FailedList []interface{}
} }
func (s TaskList) Len() int { func (s TaskList) Len() int {
@@ -366,21 +365,25 @@ func (t *BaseTask) Error() (errMsg string) {
} }
func (t *BaseTask) GetErrMsg() (failedList []*ErrMsg) { func (t *BaseTask) GetErrMsg() (failedList []*ErrMsg) {
t.locker.RLock()
defer t.locker.RUnlock()
if len(t.FailedList) == 0 { if len(t.FailedList) == 0 {
return nil return nil
} }
if t.parent != nil { if t.parent != nil {
for _, v := range t.FailedList { for _, v := range t.FailedList {
failedList = append(failedList, v) failedList = append(failedList, v.(*ErrMsg))
} }
} }
return failedList return failedList
} }
func (t *BaseTask) AddErrMsg(failedList []*ErrMsg) { func (t *BaseTask) AddErrMsg(failedList ...interface{}) {
t.locker.Lock() t.locker.Lock()
defer t.locker.Unlock() 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 { // func (t *BaseTask) GetDetailErrList() []error {
@@ -439,7 +442,6 @@ func (t *BaseTask) run(taskHandler func()) {
task.TerminatedAt = time.Now() task.TerminatedAt = time.Now()
task.locker.Unlock() task.locker.Unlock()
task.Error() task.Error()
task.GetErrMsg()
globals.SugarLogger.Debugf("Task:%s, mainErr:%v, batchErrList:%v", task.Name, task.mainErr, task.batchErrList) globals.SugarLogger.Debugf("Task:%s, mainErr:%v, batchErrList:%v", task.Name, task.mainErr, task.batchErrList)
select { select {

2
business/partner/putils/store_sku.go
View File

@@ -246,7 +246,6 @@ func SelectStoreSkuListByFoodList(storeID int, storeSkuList []*partner.StoreSkuI
SkuID: v.SkuID, SkuID: v.SkuID,
VendorSkuID: v.VendorSkuID, VendorSkuID: v.VendorSkuID,
StoreID: storeID, StoreID: storeID,
Status: v.Status,
VendorPrice: v.VendorPrice, VendorPrice: v.VendorPrice,
Err: foodMap[v.VendorSkuID], Err: foodMap[v.VendorSkuID],
} }
@@ -269,7 +268,6 @@ func SelectStoreSkuListByOpResult(storeID int, storeSkuList []*partner.StoreSkuI
SkuID: v.SkuID, SkuID: v.SkuID,
VendorSkuID: v.VendorSkuID, VendorSkuID: v.VendorSkuID,
StoreID: storeID, StoreID: storeID,
Status: v.Status,
VendorPrice: v.VendorPrice, VendorPrice: v.VendorPrice,
Err: opResultMap[utils.Str2Int64(v.VendorSkuID)], Err: opResultMap[utils.Str2Int64(v.VendorSkuID)],
} }