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

1

Browse Source
This commit is contained in:
邹宗楠
2024-03-11 10:09:48 +08:00
parent 738f1820d5
commit 73821c40a1
16 changed files with 276 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -966,7 +966,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
canDeliveryVendor := make(map[int64]int, 0)
canDeliveryKey := make([]int64, 0, 0)
for k, v := range feeList {
if excludeVendorIDsMap[k] != model.YES && v.DeliveryFee != model.NO {
if excludeVendorIDsMap[k] != model.YES && v.DeliveryFee > model.NO && v.DeliveryFee <= 5000 { // 限制配送价格
canDeliveryVendor[v.DeliveryFee] = k
canDeliveryKey = append(canDeliveryKey, v.DeliveryFee)
}
@@ -996,37 +996,6 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS}
vendorID = model.VendorIDFengNiao
}
//storeCourierList, err := dao.GetStoreCourierList2(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusOpened, []int{model.StoreAuditStatusOnline, model.StoreAuditStatusUpdated})
//for _, v := range storeCourierList {
// if excludeVendorIDsMap[v.VendorID] == model.YES {
// continue
// }
// if v.VendorID == model.VendorIDDada {
// excludeVendorIDs = []int{model.VendorIDFengNiao, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS}
// vendorID = v.VendorID
// break
// }
// if v.VendorID == model.VendorIDFengNiao {
// excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS}
// vendorID = v.VendorID
// break
// }
// if v.VendorID == model.VendorIDMTPS {
// excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS}
// vendorID = v.VendorID
// break
// }
// if v.VendorID == model.VendorIDUUPT {
// excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDSFPS}
// vendorID = v.VendorID
// break
// }
// if v.VendorID == model.VendorIDSFPS {
// excludeVendorIDs = []int{model.VendorIDDada, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDFengNiao}
// vendorID = v.VendorID
// break
// }
//}
if vendorID != model.NO {
if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {