From af7ba61bbcce5d041724c93cfcddc02a4d2b1aa6 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 26 Nov 2019 11:47:33 +0800 Subject: [PATCH] bug fix --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- business/model/dao/act.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 0da8d7bca..7f06ad3fe 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -31,7 +31,7 @@ const ( minute2Schedule3rdCarrier4Ebai = 30 // 饿百的最少转自配送需要的时间（分钟） minMinute2Schedule3rdCarrier = 5 // 转三方配送最少等待时间（分钟） - time2AutoPickupMin = 15 * time.Minute // 自动拣货等待时间，这个只有在没有PickDeadline信息才有用，否则会根据PickDeadline设置 + time2AutoPickupMin = 14 * time.Minute // 自动拣货等待时间，这个只有在没有PickDeadline信息才有用，否则会根据PickDeadline设置 second2AutoPickupGap = 60 //随机60秒 time2AutoPickupAhead = 20 * time.Second // 有最后拣货时间的提前值 diff --git a/business/model/dao/act.go b/business/model/dao/act.go index 5475f3a8f..47e2f013b 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -75,7 +75,7 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs pageSize = FormalizePageSize(pageSize) leftOrEmpty := "" - if len(vendorIDs) == 1 && vendorIDs[0] == -1 { + if len(vendorIDs) == 1 && (vendorIDs[0] == -1 || vendorIDs[0] == model.VendorIDJX) { leftOrEmpty = "LEFT" } sql := fmt.Sprintf(`