- getOrders中优化对时间字符的解析处理
This commit is contained in:
@@ -295,21 +295,17 @@ func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku bool, from
|
||||
vendorOrderID,
|
||||
}
|
||||
} else {
|
||||
fromDate, err2 := utils.TryStr2Time(fromDateStr)
|
||||
timeList, err2 := jxutils.BatchStr2Time(fromDateStr, toDateStr)
|
||||
if err = err2; err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
if utils.IsTimeZero(fromDate) {
|
||||
if utils.IsTimeZero(timeList[0]) {
|
||||
return nil, 0, fmt.Errorf("在没有指定订单号时,必须指定查询日期范围")
|
||||
}
|
||||
if toDateStr == "" {
|
||||
toDateStr = fromDateStr
|
||||
if utils.IsTimeZero(timeList[1]) {
|
||||
timeList[1] = timeList[0]
|
||||
}
|
||||
toDate, err2 := utils.TryStr2Time(toDateStr)
|
||||
if err = err2; err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
toDate = toDate.Add(24 * time.Hour)
|
||||
timeList[1] = timeList[1].Add(24 * time.Hour)
|
||||
if isDateFinish {
|
||||
sqlWhere = `
|
||||
WHERE t1.order_finished_at >= ? AND t1.order_finished_at < ?`
|
||||
@@ -318,8 +314,8 @@ func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku bool, from
|
||||
WHERE t1.order_created_at >= ? AND t1.order_created_at < ?`
|
||||
}
|
||||
sqlParams = []interface{}{
|
||||
fromDate,
|
||||
toDate,
|
||||
timeList[0],
|
||||
timeList[1],
|
||||
}
|
||||
if params["keyword"] != nil {
|
||||
keyword := params["keyword"].(string)
|
||||
|
||||
Reference in New Issue
Block a user