GetEffectiveActStoreSkuInfo中排除绑定活动

business/jxstore/act/act.go

@@ -879,7 +879,7 @@ func SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITask, actID int, vendor
 					// 保存最后一次同步错误信息
 					dao.UpdateEntity(db, tmpActMap, "Remark")
 				} else {
-					SyncSpecialAct(ctx, task, actMap[vendorID], nil, actStoreSkuMap[vendorID])
+					err = SyncSpecialAct(ctx, task, actMap[vendorID], nil, actStoreSkuMap[vendorID])
 				}
 			} else {
 				globals.SugarLogger.Warnf("SyncAct strange actID:%d, vendorID:%d", actID, vendorID)

business/model/dao/act.go

@@ -410,6 +410,9 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, actType
 		sql += " AND t2.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
 	}
+	if globals.IsStoreSkuAct {
+		sql += " AND t1.is_special = 0"
+	}
 	// globals.SugarLogger.Debug(sql)
 	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
 	err = GetRows(db, &actStoreSkuList, sql, sqlParams...)
@@ -523,7 +526,7 @@ func GetStoresSkusAct(db *DaoDB, hintActID int, mustDirty bool, storeIDs, skuIDs
 		sqlParams = append(sqlParams, hintActID)
 	}
 	if mustDirty {
-		sql += " AND t1.sync_status <> 0"
+		sql += " AND (t1.sync_status <> 0 OR (t1.act_percentage = 0 AND t1.vendor_act_id <> '') OR (t1.act_percentage <> 0 AND t1.vendor_act_id = ''))"
 	}
 	if len(storeIDs) > 0 {
 		sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"