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

- disable status field missing warning.

Browse Source
This commit is contained in:
gazebo
2018-11-16 13:23:42 +08:00
parent 254a8172d3
commit 1ff2463768
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
) )
@@ -168,8 +169,10 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.
retVal = c.onOrderNew(msg) retVal = c.onOrderNew(msg)
} else { } else {
status := c.callbackMsg2Status(msg) status := c.callbackMsg2Status(msg)
err := partner.CurOrderManager.OnOrderStatusChanged(status) if status != nil {
retVal = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil) err := partner.CurOrderManager.OnOrderStatusChanged(status)
retVal = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil)
}
} }
return retVal return retVal
} }
@@ -185,19 +188,23 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiap
}) })
} }
func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.OrderStatus { func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) (orderStatus *model.OrderStatus) {
vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"])) if status, ok := msg.Body["status"]; ok {
orderID := GetOrderIDFromMsg(msg) vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(status))
orderStatus := &model.OrderStatus{ orderID := GetOrderIDFromMsg(msg)
VendorOrderID: orderID, orderStatus = &model.OrderStatus{
VendorID: model.VendorIDEBAI, VendorOrderID: orderID,
OrderType: model.OrderTypeOrder, VendorID: model.VendorIDEBAI,
RefVendorOrderID: orderID, OrderType: model.OrderTypeOrder,
RefVendorID: model.VendorIDEBAI, RefVendorOrderID: orderID,
VendorStatus: vendorStatus, RefVendorID: model.VendorIDEBAI,
Status: c.GetStatusFromVendorStatus(vendorStatus), VendorStatus: vendorStatus,
StatusTime: utils.Timestamp2Time(msg.Timestamp), Status: c.GetStatusFromVendorStatus(vendorStatus),
Remark: utils.Interface2String(msg.Body["reason"]), StatusTime: utils.Timestamp2Time(msg.Timestamp),
Remark: utils.Interface2String(msg.Body["reason"]),
}
} else {
globals.SugarLogger.Infof("ebai callbackMsg2Status can not find status field in msg:%s", utils.Format4Output(msg, false))
} }
return orderStatus return orderStatus
} }