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

- ebai.CmdOrderPartRefund的业务流程处理

Browse Source
This commit is contained in:
gazebo
2019-04-14 17:54:47 +08:00
parent 99f675fcb4
commit b91fe783f6
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/purchase/ebai/callback.go
View File

@@ -11,7 +11,7 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse
if orderID := GetOrderIDFromMsg(msg); orderID != "" { if orderID := GetOrderIDFromMsg(msg); orderID != "" {
jxutils.CallMsgHandler(func() { jxutils.CallMsgHandler(func() {
switch msg.Cmd { switch msg.Cmd {
case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus, ebaiapi.CmdOrderUserCancel: case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus, ebaiapi.CmdOrderUserCancel, ebaiapi.CmdOrderPartRefund:
response = CurPurchaseHandler.onOrderMsg(msg) response = CurPurchaseHandler.onOrderMsg(msg)
case ebaiapi.CmdOrderDeliveryStatus: case ebaiapi.CmdOrderDeliveryStatus:
response = CurPurchaseHandler.onWaybillMsg(msg) response = CurPurchaseHandler.onWaybillMsg(msg)

14
business/partner/purchase/ebai/order.go
View File

@@ -24,8 +24,9 @@ const (
callDeliveryDelay = 10 * time.Minute callDeliveryDelay = 10 * time.Minute
callDeliveryDelayGap = 30 callDeliveryDelayGap = 30
// fakePickedUp = "9527" // fakePickedUp = "9527"
fakeUserApplyCancel = "fake_user_apply_cancel" fakeUserApplyCancel = "fake_user_apply_cancel"
fakeAcceptOrder = "fake_accept_order" fakeAcceptOrder = "fake_accept_order"
fakePartRefundFinished = "fake_part_refund_finished"
) )
// 饿百的接单会直接召唤配送，为了统一将饿百的接单影射成拣货完成，然后模拟一个接单消息 // 饿百的接单会直接召唤配送，为了统一将饿百的接单影射成拣货完成，然后模拟一个接单消息
@@ -34,6 +35,7 @@ var (
VendorStatus2StatusMap = map[string]int{ VendorStatus2StatusMap = map[string]int{
ebaiapi.OrderStatusNew: model.OrderStatusNew, ebaiapi.OrderStatusNew: model.OrderStatusNew,
fakeAcceptOrder: model.OrderStatusAccepted, fakeAcceptOrder: model.OrderStatusAccepted,
fakePartRefundFinished: model.OrderStatusAdjust,
ebaiapi.OrderStatusAccepted: model.OrderStatusFinishedPickup, ebaiapi.OrderStatusAccepted: model.OrderStatusFinishedPickup,
fakeUserApplyCancel: model.OrderStatusApplyCancel, fakeUserApplyCancel: model.OrderStatusApplyCancel,
ebaiapi.OrderStatusCourierAccepted: model.OrderStatusDelivering, ebaiapi.OrderStatusCourierAccepted: model.OrderStatusDelivering,
@@ -269,6 +271,14 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) (orderSta
} else { } else {
orderStatus = nil orderStatus = nil
} }
} else if msg.Cmd == ebaiapi.CmdOrderPartRefund {
if utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"])) == ebaiapi.OrderPartRefundSuccess {
orderStatus.VendorStatus = fakePartRefundFinished
orderStatus.Status = c.GetStatusFromVendorStatus(orderStatus.VendorStatus)
orderStatus.Remark = utils.Interface2String(msg.Body["reason"])
} else {
orderStatus = nil
}
} else if status, ok := msg.Body["status"]; ok { } else if status, ok := msg.Body["status"]; ok {
if vendorStatus, ok := status.(string); ok { if vendorStatus, ok := status.(string); ok {
orderStatus.VendorStatus = vendorStatus orderStatus.VendorStatus = vendorStatus