- GetEffectiveActStoreSkuInfo中的BUG，对于非结算活动类型，要判断同步状态

business/model/dao/act.go

@@ -330,10 +330,19 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, storeIDs
 	t3.actual_act_price, t3.sync_status, t3.vendor_price, t3.vendor_id
 	FROM act t1
 	JOIN act_store_sku t2 ON t2.act_id = t1.id AND t2.deleted_at = ?
-	JOIN act_store_sku_map t3 ON t3.bind_id = t2.id AND t3.act_id = t1.id
+	JOIN act_store_sku_map t3 ON t3.bind_id = t2.id AND t3.act_id = t1.id AND (t3.sync_status & ? = 0 OR t1.type = ?)
+	JOIN act_map t4 ON t4.act_id = t1.id AND t4.vendor_id = t3.vendor_id AND t4.deleted_at = ? AND (t4.sync_status & ? = 0 OR t1.type = ?)
 	WHERE t1.deleted_at = ? AND t1.status = ? AND NOT (t1.begin_at > ? OR t1.end_at < ?)`
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
+
+		model.SyncFlagNewMask,
+		model.ActSkuFake,
+
+		utils.DefaultTimeValue,
+		model.SyncFlagNewMask,
+		model.ActSkuFake,
+
 		utils.DefaultTimeValue,
 		model.ActStatusCreated,
 		endAt,