Merge remote-tracking branch 'origin/mark' into yonghui

2019-12-17 14:10:59 +08:00
parent a02dbdeacc 6e3ee7c9c1
commit b2994f13cd
6 changed files with 48 additions and 26 deletions
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -762,7 +762,7 @@ func SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITask, actID int, vendor
 	if vendorIDs == nil {
 		vendorIDs = partner.GetVendorIDsFromActMap(actMap)
 	}
-	if len(vendorIDs) == 0 || actMap[vendorIDs[0]].Type == model.ActSkuFake {
+	if len(vendorIDs) == 0 || vendorIDs[0] == model.VendorIDJX || actMap[vendorIDs[0]].Type == model.ActSkuFake {
 		return "", nil
 	}
 	task := tasksch.NewParallelTask("SyncAct", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,