diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 42576b260..6dd26388b 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -466,7 +466,7 @@ func (s *DefScheduler) removeWaybillFromMap(savedOrderInfo *WatchOrderInfo, wayb func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInfo, excludeBill *model.Waybill) (err error) { order := savedOrderInfo.order globals.SugarLogger.Debugf("createWaybillOn3rdProviders, orderID:%s, status:%d, excludeBill:%v", order.VendorOrderID, order.Status, excludeBill) - if order.VendorID == model.VendorIDEBAI { + if order.VendorID == model.VendorIDELM { return nil } if order.WaybillVendorID == model.VendorIDUnknown { diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 1f6d4bfdd..9cc795436 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -137,40 +137,45 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI } func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) { - // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { - // err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID) - // } + globals.SugarLogger.Debugf("ebai PickupGoods orderID:%s", order.VendorOrderID) + if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { + err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID) + } p.postFakeFinishedPickupMsg(order.VendorOrderID) // 饿百没有拣货完成事件,模拟发送 return err } // 将订单从购物平台配送转为自送 func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { - // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { - // err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID) - // } + globals.SugarLogger.Debugf("ebai Swtich2SelfDeliver orderID:%s", order.VendorOrderID) + if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { + err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID) + } return err } // 将订单从购物平台配送转为自送后又送达 func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("ebai Swtich2SelfDelivered orderID:%s", order.VendorOrderID) // todo 饿百转商家自送后,没有确认送达的概念,空操作 return err } // 完全自送的门店表示开始配送 func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { - // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { - // err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName) - // } + globals.SugarLogger.Debugf("ebai SelfDeliverDelivering orderID:%s", order.VendorOrderID) + if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { + err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName) + } return err } // 完全自送的门店表示配送完成 func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { - // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { - // err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName) - // } + globals.SugarLogger.Debugf("ebai SelfDeliverDelievered orderID:%s", order.VendorOrderID) + if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { + err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName) + } return err } diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go index 57f56ca95..6790068b3 100644 --- a/business/partner/purchase/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -285,9 +285,9 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) } func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { - if globals.EnableElmStoreWrite { - err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID) - } + // if globals.EnableElmStoreWrite { + // err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID) + // } return err } @@ -297,16 +297,16 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName } func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { - if globals.EnableElmStoreWrite { - err = api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) - } + // if globals.EnableElmStoreWrite { + // err = api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) + // } return err } func (c *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { - if globals.EnableElmStoreWrite { - err = api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) - } + // if globals.EnableElmStoreWrite { + // err = api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) + // } return err }