1
This commit is contained in:
@@ -728,11 +728,11 @@ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
|
|||||||
sqlParams = append(sqlParams, keyword, keyword, "%"+keyword+"%", "%"+keyword+"%")
|
sqlParams = append(sqlParams, keyword, keyword, "%"+keyword+"%", "%"+keyword+"%")
|
||||||
}
|
}
|
||||||
if !utils.IsTimeZero(beginAt) {
|
if !utils.IsTimeZero(beginAt) {
|
||||||
sql += " AND a.begin_at <= ?"
|
sql += " AND a.begin_at >= ?"
|
||||||
sqlParams = append(sqlParams, beginAt)
|
sqlParams = append(sqlParams, beginAt)
|
||||||
}
|
}
|
||||||
if !utils.IsTimeZero(endAt) {
|
if !utils.IsTimeZero(endAt) {
|
||||||
sql += " AND a.end_at >= ?"
|
sql += " AND a.end_at <= ?"
|
||||||
sqlParams = append(sqlParams, endAt)
|
sqlParams = append(sqlParams, endAt)
|
||||||
}
|
}
|
||||||
if actType != 0 {
|
if actType != 0 {
|
||||||
@@ -752,11 +752,8 @@ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
globals.SugarLogger.Debugf("sql := %s", sql)
|
|
||||||
globals.SugarLogger.Debugf("sql := %s", utils.Format4Output(sqlParams, false))
|
|
||||||
if err = GetRowsTx(txDB, &acts, sql, sqlParams...); err == nil && len(acts) != 0 {
|
if err = GetRowsTx(txDB, &acts, sql, sqlParams...); err == nil && len(acts) != 0 {
|
||||||
aa := GetLastTotalRowCount2(db, txDB)
|
pageInfo.TotalCount = GetLastTotalRowCount2(db, txDB)
|
||||||
pageInfo.TotalCount = aa
|
|
||||||
pageInfo.Data = acts
|
pageInfo.Data = acts
|
||||||
}
|
}
|
||||||
Commit(db, txDB)
|
Commit(db, txDB)
|
||||||
|
|||||||
Reference in New Issue
Block a user