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