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

- TryStr2Time

Browse Source
This commit is contained in:
gazebo
2018-11-05 22:04:28 +08:00
parent 594ca76de3
commit ee5e7ffe18
4 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,11 +224,18 @@ func (c *OrderManager) GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID
func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toDateStr string) (excelContent []byte, err error) {
globals.SugarLogger.Debugf("ExportMTWaybills from:%s to:%s", fromDateStr, toDateStr)
fromDate := utils.Str2Time(fromDateStr)
fromDate, err := utils.TryStr2Time(fromDateStr)
if err != nil {
return nil, err
}
if toDateStr == "" {
toDateStr = fromDateStr
}
toDate := utils.Str2Time(toDateStr).Add(24 * time.Hour)
toDate, err := utils.TryStr2Time(toDateStr)
if err != nil {
return nil, err
}
toDate = toDate.Add(24 * time.Hour)
var waybills []*tWaybillExt
sql := `
SELECT t1.*, t2.store_name, IF(t2.store_id <> 0, t2.store_id, t2.jx_store_id) store_id
@@ -265,11 +272,18 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD
func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
globals.SugarLogger.Debugf("GetOrders from:%s to:%s", fromDateStr, toDateStr)
fromDate := utils.Str2Time(fromDateStr)
fromDate, err := utils.TryStr2Time(fromDateStr)
if err != nil {
return nil, err
}
if toDateStr == "" {
toDateStr = fromDateStr
}
toDate := utils.Str2Time(toDateStr).Add(24 * time.Hour)
toDate, err := utils.TryStr2Time(toDateStr)
if err != nil {
return nil, err
}
toDate = toDate.Add(24 * time.Hour)
pageSize = jxutils.FormalizePageSize(pageSize)
if offset < 0 {
offset = 0
@@ -388,11 +402,18 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr
func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
globals.SugarLogger.Debugf("GetWaybills from:%s to:%s", fromDateStr, toDateStr)
fromDate := utils.Str2Time(fromDateStr)
fromDate, err := utils.TryStr2Time(fromDateStr)
if err != nil {
return nil, err
}
if toDateStr == "" {
toDateStr = fromDateStr
}
toDate := utils.Str2Time(toDateStr).Add(24 * time.Hour)
toDate, err := utils.TryStr2Time(toDateStr)
if err != nil {
return nil, err
}
toDate = toDate.Add(24 * time.Hour)
pageSize = jxutils.FormalizePageSize(pageSize)
if offset < 0 {
offset = 0

12
business/jxstore/promotion/jd_promotion.go
View File

@@ -469,11 +469,19 @@ func GetJdPromotions(ctx *jxcontext.Context, keyword string, params map[string]i
}
if params["beginAt"] != nil {
sql += " AND t1.begin_at <= ?"
sqlParams = append(sqlParams, utils.Str2Time(params["beginAt"].(string)))
beginAt, err2 := utils.TryStr2Time(params["beginAt"].(string))
if err = err2; err != nil {
return nil, err
}
sqlParams = append(sqlParams, beginAt)
}
if params["endAt"] != nil {
sql += " AND t1.end_at >= ?"
sqlParams = append(sqlParams, utils.Str2Time(params["endAt"].(string)))
endAt, err2 := utils.TryStr2Time(params["endAt"].(string))
if err = err2; err != nil {
return nil, err
}
sqlParams = append(sqlParams, endAt)
}
days := defSearchDays
if params["days"] != nil {