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

- revert time2Schedule3rdCarrier = 30 * time.Minute

Browse Source
This commit is contained in:
gazebo
2018-11-12 10:19:33 +08:00
parent 8cea399565
commit 86b50e5c66
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -22,7 +22,7 @@ import (
const ( const (
time2Delivered = 1 * time.Hour // 正常从下单到送达的时间。 time2Delivered = 1 * time.Hour // 正常从下单到送达的时间。
time2Schedule3rdCarrier = 15 * time.Minute // 京东要求5分钟后才能转自送，保险起见，设置为5分半钟 time2Schedule3rdCarrier = 30 * time.Minute // 京东要求5分钟后才能转自送，保险起见，设置为5分半钟
// time2Schedule3rdCarrierGap4OrderStatus = 3 * time.Minute // 京东要求是运单状态为待抢单且超时5分钟，但为了防止没有运单事件，所以就拣货完成事件开始算，添加3分钟 // time2Schedule3rdCarrierGap4OrderStatus = 3 * time.Minute // 京东要求是运单状态为待抢单且超时5分钟，但为了防止没有运单事件，所以就拣货完成事件开始算，添加3分钟
time2AutoPickupMin = 15 * time.Minute time2AutoPickupMin = 15 * time.Minute
time2AutoPickupGap = 5 * 60 //随机5分钟 time2AutoPickupGap = 5 * 60 //随机5分钟

5
business/jxstore/cms/sku.go
View File

@@ -10,7 +10,6 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
) )
type SkuNamesInfo struct { type SkuNamesInfo struct {
@@ -335,8 +334,8 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]inter
panic(r) panic(r)
} }
}() }()
globals.SugarLogger.Debug(sqlData) // globals.SugarLogger.Debug(sqlData)
globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false)) // globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
if err = dao.GetRows(db, &skuNamesInfo.SkuNames, sqlData, sqlParams...); err == nil { if err = dao.GetRows(db, &skuNamesInfo.SkuNames, sqlData, sqlParams...); err == nil {
countInfo := &struct{ Ct int }{} countInfo := &struct{ Ct int }{}
if err = dao.GetRow(db, countInfo, "SELECT FOUND_ROWS() ct"); err == nil { if err = dao.GetRow(db, countInfo, "SELECT FOUND_ROWS() ct"); err == nil {