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

冲突处理

Browse Source
This commit is contained in:
苏尹岚
2020-01-09 14:45:51 +08:00
parent 20fc83000e 580b3c735f
commit 8f78abc97d
4 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,7 +186,7 @@ func GetActStoreSkuVendorInfo(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
}
func QueryActs(db *DaoDB, actID int, offset, pageSize int, syncStatus int, keyword string, vendorID int, statusList, actTypeList, createTypeList []int,
storeID, skuID, cityCode int, beginAt, endAt, createdAtFrom, createdAtTo time.Time) (pagedInfo *PagedActListInfo, err error) {
storeID int, skuIDs []int, cityCode int, beginAt, endAt, createdAtFrom, createdAtTo time.Time) (pagedInfo *PagedActListInfo, err error) {
if actID == 0 && utils.IsTimeZero(createdAtFrom) && utils.IsTimeZero(beginAt) {
return nil, fmt.Errorf("actID,createdAtFrom和beginAt中，至少要指定一个条件")
}
@@ -231,7 +231,7 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, syncStatus int, keywo
}
sql += ")"
}
if storeID > 0 || skuID > 0 || cityCode > 0 {
if storeID > 0 || len(skuIDs) > 0 || cityCode > 0 {
sql += ` AND (SELECT COUNT(*)
FROM act_store_sku t2`
if cityCode > 0 {
@@ -245,9 +245,9 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, syncStatus int, keywo
sql += " AND t2.store_id = ?"
sqlParams = append(sqlParams, storeID)
}
if skuID > 0 {
sql += " AND t2.sku_id = ?"
sqlParams = append(sqlParams, skuID)
if len(skuIDs) > 0 {
sql += " AND t2.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
sqlParams = append(sqlParams, skuIDs)
}
sql += ") > 0"
}