1
This commit is contained in:
@@ -1168,31 +1168,31 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
|
|||||||
sqlParams []interface{}
|
sqlParams []interface{}
|
||||||
)
|
)
|
||||||
// 如果搜索关键字可能为订单或售后单号,则当成订单或售后单查询
|
// 如果搜索关键字可能为订单或售后单号,则当成订单或售后单查询
|
||||||
//if keyword != "" {
|
if keyword != "" {
|
||||||
// if jxutils.GetPossibleVendorIDFromAfsOrderID(keyword) > model.VendorIDUnknown && afsOrderID == "" {
|
if jxutils.GetPossibleVendorIDFromAfsOrderID(keyword) > model.VendorIDUnknown && afsOrderID == "" {
|
||||||
// afsOrderID = keyword
|
afsOrderID = keyword
|
||||||
// }
|
}
|
||||||
// if jxutils.GetPossibleVendorIDFromVendorOrderID(keyword) > model.VendorIDUnknown && vendorOrderID == "" {
|
if jxutils.GetPossibleVendorIDFromVendorOrderID(keyword) > model.VendorIDUnknown && vendorOrderID == "" {
|
||||||
// vendorOrderID = keyword
|
vendorOrderID = keyword
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
//if vendorOrderID != "" || afsOrderID != "" {
|
if vendorOrderID != "" || afsOrderID != "" {
|
||||||
// sqlWhere = "WHERE (0 = 1"
|
sqlWhere = "WHERE (0 = 1"
|
||||||
// if vendorOrderID != "" {
|
if vendorOrderID != "" {
|
||||||
// sqlWhere += " OR (t1.vendor_order_id = ? OR t1.vendor_order_id2 = ?)"
|
sqlWhere += " OR (t1.vendor_order_id = ? OR t1.vendor_order_id2 = ?)"
|
||||||
// sqlParams = append(sqlParams, []interface{}{
|
sqlParams = append(sqlParams, []interface{}{
|
||||||
// vendorOrderID,
|
vendorOrderID,
|
||||||
// vendorOrderID,
|
vendorOrderID,
|
||||||
// })
|
})
|
||||||
// }
|
}
|
||||||
// if afsOrderID != "" {
|
if afsOrderID != "" {
|
||||||
// sqlWhere += " OR (t1.afs_order_id = ?)"
|
sqlWhere += " OR (t1.afs_order_id = ?)"
|
||||||
// sqlParams = append(sqlParams, []interface{}{
|
sqlParams = append(sqlParams, []interface{}{
|
||||||
// afsOrderID,
|
afsOrderID,
|
||||||
// })
|
})
|
||||||
// }
|
}
|
||||||
// sqlWhere += ")"
|
sqlWhere += ")"
|
||||||
//} else {
|
} else {
|
||||||
if toTime.Sub(fromTime) > 24*time.Hour*60 {
|
if toTime.Sub(fromTime) > 24*time.Hour*60 {
|
||||||
return nil, fmt.Errorf("售后单查询时间不能超过60天")
|
return nil, fmt.Errorf("售后单查询时间不能超过60天")
|
||||||
}
|
}
|
||||||
@@ -1236,7 +1236,7 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
|
|||||||
sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDList)) + ")"
|
sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDList)) + ")"
|
||||||
sqlParams = append(sqlParams, vendorIDList)
|
sqlParams = append(sqlParams, vendorIDList)
|
||||||
}
|
}
|
||||||
//}
|
}
|
||||||
sql += sqlWhere
|
sql += sqlWhere
|
||||||
sql += `
|
sql += `
|
||||||
ORDER BY t1.afs_created_at DESC
|
ORDER BY t1.afs_created_at DESC
|
||||||
|
|||||||
Reference in New Issue
Block a user