From 1a775d8fd6d36296671ae9f48e468dd743a36a90 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 31 Mar 2019 16:07:00 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=BE=93=E5=87=BA=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=93=8D=E4=BD=9C=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/basesch/basesch.go | 4 ++-- business/partner/partner.go | 2 +- business/partner/purchase/ebai/order.go | 14 +++++++++++--- business/partner/purchase/elm/order.go | 2 +- business/partner/purchase/jd/order.go | 10 ++++++++-- business/partner/purchase/mtwm/order.go | 8 +++++++- business/partner/purchase/weimob/wsc/order.go | 4 ++-- 7 files changed, 32 insertions(+), 12 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 5b0763dc8..438b1fd07 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -32,12 +32,12 @@ func (c *BaseScheduler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt return err } -func (c *BaseScheduler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) { +func (c *BaseScheduler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { globals.SugarLogger.Infof("PickupGoods orderID:%s", order.VendorOrderID) if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusAccepted { if c.IsReallyCallPlatformAPI { err = utils.CallFuncLogErrorWithInfo(func() error { - return partner.GetPurchasePlatformFromVendorID(order.VendorID).PickupGoods(order, isSelfDeilivery, userName) + return partner.GetPurchasePlatformFromVendorID(order.VendorID).PickupGoods(order, isSelfDelivery, userName) }, "PickupGoods orderID:%s", order.VendorOrderID) } } else { diff --git a/business/partner/partner.go b/business/partner/partner.go index 66a3d24db..60b67b2d6 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -98,7 +98,7 @@ type IPurchasePlatformHandler interface { GetStatusActionTimeout(order *model.GoodsOrder, statusType, status int) (params *StatusActionParams) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) - PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) + PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) // 将订单从购物平台配送转为自送 Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 0aaf26f6a..3a421e66f 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -157,7 +157,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo } func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) { - globals.SugarLogger.Debugf("ebai AcceptOrRefuseOrder orderID:%s", order.VendorOrderID) + globals.SugarLogger.Debugf("ebai AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt) if isAcceptIt { p.postFakeMsg(order.VendorOrderID, fakeAcceptOrder) } else { @@ -168,8 +168,8 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI return err } -func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) { - globals.SugarLogger.Debugf("ebai PickupGoods orderID:%s", order.VendorOrderID) +func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { + globals.SugarLogger.Debugf("ebai PickupGoods orderID:%s, isSelfDelivery:%t", order.VendorOrderID, isSelfDelivery) if globals.EnableEbaiStoreWrite { err = api.EbaiAPI.OrderConfirm(order.VendorOrderID) } else { @@ -184,6 +184,10 @@ func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s if globals.EnableEbaiStoreWrite { err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID) } + if err == nil { + // 饿百不会发送配送中，模拟发送 + p.postFakeMsg(order.VendorOrderID, ebaiapi.OrderStatusCourierAccepted) + } return err } @@ -200,6 +204,10 @@ func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam if globals.EnableEbaiStoreWrite { err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName) } + if err == nil { + // 饿百不会发送配送中，模拟发送 + p.postFakeMsg(order.VendorOrderID, ebaiapi.OrderStatusCourierAccepted) + } return err } diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go index 29b9fbddb..3e606af37 100644 --- a/business/partner/purchase/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -288,7 +288,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI // 饿了么没有拣货这个状态，直接返回成功 // 真实流程中也不会调用这个方法，因为接收订单后状态会直接转移到已拣货 -func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) { +func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { return nil } diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 5734d4857..5d316ad2b 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -228,6 +228,7 @@ func (c *PurchaseHandler) GetStatusFromVendorStatus(vendorStatus string) int { } func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) { + globals.SugarLogger.Debugf("jd AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt) if globals.EnableStoreWrite { err = api.JdAPI.OrderAcceptOperate(order.VendorOrderID, isAcceptIt, userName) } else { @@ -236,8 +237,9 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI return err } -func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) { - if !isSelfDeilivery && globals.EnableStoreWrite { +func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { + globals.SugarLogger.Debugf("jd PickupGoods orderID:%s, isSelfDelivery:%t", order.VendorOrderID, isSelfDelivery) + if !isSelfDelivery && globals.EnableStoreWrite { _, err = api.JdAPI.OrderJDZBDelivery(order.VendorOrderID, userName) } else { c.postFakeMsg(order.VendorOrderID, jdapi.OrderStatusFinishedPickup) @@ -246,6 +248,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery b } func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("jd Swtich2SelfDeliver orderID:%s", order.VendorOrderID) if globals.EnableStoreWrite { _, err = api.JdAPI.ModifySellerDelivery(order.VendorOrderID, userName) if err != nil { @@ -266,6 +269,7 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s } func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("jd Swtich2SelfDelivered orderID:%s", order.VendorOrderID) if globals.EnableStoreWrite { _, err = api.JdAPI.DeliveryEndOrder(order.VendorOrderID, userName) } @@ -273,6 +277,7 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName } func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("jd SelfDeliverDelivering orderID:%s", order.VendorOrderID) if globals.EnableStoreWrite { _, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID, userName) } @@ -281,6 +286,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam // 京东送达接口都是一样的 func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("jd SelfDeliverDelivered orderID:%s", order.VendorOrderID) if globals.EnableStoreWrite { err = c.Swtich2SelfDelivered(order, userName) } diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 33e6b33e6..549c65feb 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -217,6 +217,7 @@ func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, vendorStatus string) { } func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) { + globals.SugarLogger.Debugf("mtwm AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt) if isAcceptIt { if globals.EnableMtwmStoreWrite { err = api.MtwmAPI.OrderReceived(utils.Str2Int64(order.VendorOrderID)) @@ -232,7 +233,8 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI return err } -func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) { +func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { + globals.SugarLogger.Debugf("mtwm PickupGoods orderID:%s, isSelfDelivery:%t", order.VendorOrderID, isSelfDelivery) if globals.EnableMtwmStoreWrite { err = api.MtwmAPI.OrderConfirm(utils.Str2Int64(order.VendorOrderID)) } else { @@ -242,6 +244,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery b } func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("mtwm Swtich2SelfDeliver orderID:%s", order.VendorOrderID) if globals.EnableMtwmStoreWrite { err = api.MtwmAPI.OrderLogisticsChange2Self(utils.Str2Int64(order.VendorOrderID)) } @@ -249,6 +252,7 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s } func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("mtwm Swtich2SelfDelivered orderID:%s", order.VendorOrderID) if globals.EnableMtwmStoreWrite { err = api.MtwmAPI.OrderArrived(utils.Str2Int64(order.VendorOrderID)) } @@ -256,6 +260,7 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName } func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("mtwm SelfDeliverDelivering orderID:%s", order.VendorOrderID) if globals.EnableMtwmStoreWrite { err = api.MtwmAPI.OrderDelivering(utils.Str2Int64(order.VendorOrderID)) } @@ -263,6 +268,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam } func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("mtwm SelfDeliverDelivered orderID:%s", order.VendorOrderID) if globals.EnableMtwmStoreWrite { err = api.MtwmAPI.OrderArrived(utils.Str2Int64(order.VendorOrderID)) } diff --git a/business/partner/purchase/weimob/wsc/order.go b/business/partner/purchase/weimob/wsc/order.go index b20f57bb7..33e3ac08a 100644 --- a/business/partner/purchase/weimob/wsc/order.go +++ b/business/partner/purchase/weimob/wsc/order.go @@ -187,8 +187,8 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI return err } -func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) { - if globals.EnableStoreWrite && globals.EnableWscStoreWrite && !isSelfDeilivery { +func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { + if globals.EnableStoreWrite && globals.EnableWscStoreWrite && !isSelfDelivery { _, err = dada.CurDeliveryHandler.CreateWaybill(order, delivery.DefCreateWaybillPolicy) } // 微商城没有拣货完成，模拟