修改门店发单和品牌发单是扣费问题
This commit is contained in:
@@ -1466,13 +1466,17 @@ func GetOrdersForJxPay(db *DaoDB, finishTimeBegin, finishTimeEnd time.Time) (goo
|
||||
return goods, err
|
||||
}
|
||||
|
||||
func GetWaybills(db *DaoDB, vendorOrderID string) (waybills []*model.Waybill, err error) {
|
||||
func GetWaybills(db *DaoDB, vendorOrderID string, vendors []int64) (waybills []*model.Waybill, err error) {
|
||||
sql := ` SELECT *
|
||||
FROM waybill
|
||||
WHERE vendor_order_id = ? ORDER BY waybill_created_at asc
|
||||
WHERE vendor_order_id = ?
|
||||
`
|
||||
|
||||
if len(vendors) > model.NO {
|
||||
sql += " AND waybill_vendor_id IN (" + GenQuestionMarks(len(vendors)) + ")"
|
||||
}
|
||||
sql += ` ORDER BY waybill_created_at asc`
|
||||
sqlParams := []interface{}{vendorOrderID}
|
||||
sqlParams = append(sqlParams, vendors)
|
||||
err = GetRows(db, &waybills, sql, sqlParams)
|
||||
return waybills, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user