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

- refactor order deliveryType

Browse Source
This commit is contained in:
gazebo
2019-01-23 18:31:34 +08:00
parent fb894c94f8
commit 3a0f47790f
7 changed files with 131 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,23 +110,26 @@ func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err e
if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID {
if jxStoreID > 0 {
db := dao.GetDB()
storeMap, err2 := dao.GetStoreMapByStoreID(db, jxStoreID, order.VendorID)
storeMap, err2 := dao.FakeGetStoreMapByStoreID(db, jxStoreID, order.VendorID)
if err = err2; err != nil {
return err
}
s.autoPickupTimeoutMinute = int(storeMap.AutoPickup)
s.storeDeliveryType = int(storeMap.DeliveryType)
s.storeDeliveryType = basesch.GetStoreDeliveryType(order, storeMap)
if s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
order.DeliveryFlag |= model.OrderDeliveryFlagMaskPurcahseDisabled
}
isNeedSchedule := s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore || storeMap.DeliveryCompetition != 0
if isNeedSchedule {
vendorList, err2 := dao.GetStoreCouriersByStoreID(db, jxStoreID, -1)
vendorList, err2 := dao.GetOpenedStoreCouriersByStoreID(db, jxStoreID, -1)
if err = err2; err != nil {
return err
}
for _, v := range vendorList {
s.supported3rdCarriers = append(s.supported3rdCarriers, v.VendorID)
// 达达作为微商城的自有配送，不参与竞争配送
if !(order.VendorID == model.VendorIDWSC && v.VendorID == model.VendorIDDada) {
s.supported3rdCarriers = append(s.supported3rdCarriers, v.VendorID)
}
}
if len(s.supported3rdCarriers) == 0 {
isNeedSchedule = false