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

bug fix

Browse Source
This commit is contained in:
gazebo
2019-11-26 11:47:33 +08:00
parent ed0f172865
commit af7ba61bbc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ const (
minute2Schedule3rdCarrier4Ebai = 30 // 饿百的最少转自配送需要的时间（分钟） minute2Schedule3rdCarrier4Ebai = 30 // 饿百的最少转自配送需要的时间（分钟）
minMinute2Schedule3rdCarrier = 5 // 转三方配送最少等待时间（分钟） minMinute2Schedule3rdCarrier = 5 // 转三方配送最少等待时间（分钟）
time2AutoPickupMin = 15 * time.Minute // 自动拣货等待时间，这个只有在没有PickDeadline信息才有用，否则会根据PickDeadline设置 time2AutoPickupMin = 14 * time.Minute // 自动拣货等待时间，这个只有在没有PickDeadline信息才有用，否则会根据PickDeadline设置
second2AutoPickupGap = 60 //随机60秒 second2AutoPickupGap = 60 //随机60秒
time2AutoPickupAhead = 20 * time.Second // 有最后拣货时间的提前值 time2AutoPickupAhead = 20 * time.Second // 有最后拣货时间的提前值

2
business/model/dao/act.go
View File

@@ -75,7 +75,7 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
pageSize = FormalizePageSize(pageSize) pageSize = FormalizePageSize(pageSize)
leftOrEmpty := "" leftOrEmpty := ""
if len(vendorIDs) == 1 && vendorIDs[0] == -1 { if len(vendorIDs) == 1 && (vendorIDs[0] == -1 || vendorIDs[0] == model.VendorIDJX) {
leftOrEmpty = "LEFT" leftOrEmpty = "LEFT"
} }
sql := fmt.Sprintf(` sql := fmt.Sprintf(`