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

GetEffectiveActStoreSkuInfo中排除绑定活动

Browse Source
This commit is contained in:
gazebo
2020-01-21 14:38:42 +08:00
parent 0dc7d29e61
commit 16748e7d22
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/act/act.go
View File

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

5
business/model/dao/act.go
View File

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