1
This commit is contained in:
@@ -1805,7 +1805,7 @@ func StatisticsSettlement(db *DaoDB, storeId []int, start, end time.Time, vendor
|
|||||||
}
|
}
|
||||||
if len(storeId) != 0 {
|
if len(storeId) != 0 {
|
||||||
sql += ` AND IF(gs.jx_store_id != 0, gs.jx_store_id, gs.store_id) IN (` + dao.GenQuestionMarks(len(storeId)) + `)`
|
sql += ` AND IF(gs.jx_store_id != 0, gs.jx_store_id, gs.store_id) IN (` + dao.GenQuestionMarks(len(storeId)) + `)`
|
||||||
param = append(param, vendorId)
|
param = append(param, storeId)
|
||||||
}
|
}
|
||||||
if len(vendorId) != 0 {
|
if len(vendorId) != 0 {
|
||||||
sql += ` AND gs.vendor_id IN (` + GenQuestionMarks(len(vendorId)) + `)`
|
sql += ` AND gs.vendor_id IN (` + GenQuestionMarks(len(vendorId)) + `)`
|
||||||
@@ -1890,7 +1890,7 @@ func StatisticsSettlementByCity(db *DaoDB, cityCode []string, start, end time.Ti
|
|||||||
}
|
}
|
||||||
if len(cityCode) != 0 {
|
if len(cityCode) != 0 {
|
||||||
sql += ` AND s.city_code IN (` + dao.GenQuestionMarks(len(cityCode)) + `)`
|
sql += ` AND s.city_code IN (` + dao.GenQuestionMarks(len(cityCode)) + `)`
|
||||||
param = append(param, vendorId)
|
param = append(param, cityCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
sql += ` AND s.deleted_at = ? `
|
sql += ` AND s.deleted_at = ? `
|
||||||
|
|||||||
Reference in New Issue
Block a user