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

- 添加京西商城订单取消事件

Browse Source
This commit is contained in:
gazebo
2019-09-24 10:15:16 +08:00
parent 1144d9e8ee
commit 53f4d84025
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
business/partner/purchase/jx/order.go
View File

@@ -89,15 +89,12 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
} else { } else {
status = model.OrderStatusCanceled status = model.OrderStatusCanceled
} }
c.postFakeMsg(order.VendorOrderID, status) err = c.notifyOrderStatusChanged(order, status)
jxAPI.NotifyOrderStatusChanged(order)
return err return err
} }
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
order.Status = model.OrderStatusFinishedPickup err = c.notifyOrderStatusChanged(order, model.OrderStatusFinishedPickup)
c.postFakeMsg(order.VendorOrderID, order.Status)
jxAPI.NotifyOrderStatusChanged(order)
return err return err
} }
@@ -122,15 +119,13 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
} }
func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
c.postFakeMsg(order.VendorOrderID, model.OrderStatusDelivering) err = c.notifyOrderStatusChanged(order, model.OrderStatusDelivering)
jxAPI.NotifyOrderStatusChanged(order)
return err return err
} }
// 京东送达接口都是一样的 // 京东送达接口都是一样的
func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
c.postFakeMsg(order.VendorOrderID, model.OrderStatusFinished) err = c.notifyOrderStatusChanged(order, model.OrderStatusFinished)
jxAPI.NotifyOrderStatusChanged(order)
return err return err
} }
@@ -143,6 +138,7 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
} }
func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
err = c.notifyOrderStatusChanged(order, model.OrderStatusCanceled)
return err return err
} }
@@ -165,8 +161,16 @@ func (c *PurchaseHandler) AddWaybillTip(ctx *jxcontext.Context, order *model.Goo
func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID, selfTakeCode string) (err error) { func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID, selfTakeCode string) (err error) {
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJX) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJX)
if err == nil { if err == nil {
c.postFakeMsg(order.VendorOrderID, model.OrderStatusFinished) err = c.notifyOrderStatusChanged(order, model.OrderStatusFinished)
jxAPI.NotifyOrderStatusChanged(order) }
return err
}
func (c *PurchaseHandler) notifyOrderStatusChanged(order *model.GoodsOrder, status int) (err error) {
orderMsg := *order
orderMsg.Status = status
if err = jxAPI.NotifyOrderStatusChanged(&orderMsg); err == nil {
c.postFakeMsg(orderMsg.VendorOrderID, orderMsg.Status)
} }
return err return err
} }