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

aa

Browse Source
This commit is contained in:
suyl
2021-08-02 16:06:27 +08:00
parent e58d009928
commit e12bb0a2dd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -822,7 +822,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
// excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS) // excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS)
// } // }
//TODO 2020-08-18 饿百美团订单暂时不自动发送三方 //TODO 2020-08-18 饿百美团订单暂时不自动发送三方
if order.VendorID == model.VendorIDMTWM || order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDMTWM || order.VendorID == model.VendorIDEBAI || order.VendorID == model.VendorIDJD {
if order.DeliveryType != model.OrderDeliveryTypeStoreSelf { if order.DeliveryType != model.OrderDeliveryTypeStoreSelf {
excludeVendorIDs = append(excludeVendorIDs, waybillVendorIDs...) excludeVendorIDs = append(excludeVendorIDs, waybillVendorIDs...)
} }
@@ -853,11 +853,11 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
//TODO 2020-07-21 发单时间要在门店的营业时间内 //TODO 2020-07-21 发单时间要在门店的营业时间内
var storeDetail *dao.StoreDetail var storeDetail *dao.StoreDetail
if savedOrderInfo.storeDetail != nil { //if savedOrderInfo.storeDetail != nil {
storeDetail = savedOrderInfo.storeDetail // storeDetail = savedOrderInfo.storeDetail
} else { //} else {
storeDetail, err = dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "") storeDetail, err = dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "")
} //}
if storeDetail != nil { if storeDetail != nil {
globals.SugarLogger.Debugf("三方运单门店营业时间范围 ：time1 %v ,time2 %v", storeDetail.OpenTime1, storeDetail.CloseTime1) globals.SugarLogger.Debugf("三方运单门店营业时间范围 ：time1 %v ,time2 %v", storeDetail.OpenTime1, storeDetail.CloseTime1)
if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 { if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 {