liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- getOrders中优化对时间字符的解析处理

Browse Source
This commit is contained in:
gazebo
2019-08-14 10:15:28 +08:00
parent c48ebb4bd7
commit 37ade34458
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
business/jxcallback/orderman/orderman_ext.go
View File

@@ -295,21 +295,17 @@ func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku bool, from
vendorOrderID, vendorOrderID,
} }
} else { } else {
fromDate, err2 := utils.TryStr2Time(fromDateStr) timeList, err2 := jxutils.BatchStr2Time(fromDateStr, toDateStr)
if err = err2; err != nil { if err = err2; err != nil {
return nil, 0, err return nil, 0, err
} }
if utils.IsTimeZero(fromDate) { if utils.IsTimeZero(timeList[0]) {
return nil, 0, fmt.Errorf("在没有指定订单号时，必须指定查询日期范围") return nil, 0, fmt.Errorf("在没有指定订单号时，必须指定查询日期范围")
} }
if toDateStr == "" { if utils.IsTimeZero(timeList[1]) {
toDateStr = fromDateStr timeList[1] = timeList[0]
} }
toDate, err2 := utils.TryStr2Time(toDateStr) timeList[1] = timeList[1].Add(24 * time.Hour)
if err = err2; err != nil {
return nil, 0, err
}
toDate = toDate.Add(24 * time.Hour)
if isDateFinish { if isDateFinish {
sqlWhere = ` sqlWhere = `
WHERE t1.order_finished_at >= ? AND t1.order_finished_at < ?` 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 < ?` WHERE t1.order_created_at >= ? AND t1.order_created_at < ?`
} }
sqlParams = []interface{}{ sqlParams = []interface{}{
fromDate, timeList[0],
toDate, timeList[1],
} }
if params["keyword"] != nil { if params["keyword"] != nil {
keyword := params["keyword"].(string) keyword := params["keyword"].(string)