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

Merge remote-tracking branch 'origin/mark' into su

Browse Source
This commit is contained in:
苏尹岚
2020-01-10 16:11:32 +08:00
parent c12f6288de cce92601eb
commit 90cebe1a5a
12 changed files with 286 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ func (p *PurchaseHandler) GetWaybillStatusFromVendorStatus(vendorStatus string)
func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) {
order := c.callbackMsg2Waybill(msg)
globals.SugarLogger.Debugf("ebai onWaybillMsg orderID:%s", order.VendorOrderID)
if order.Status == model.WaybillStatusAccepted {
if order.Status == model.WaybillStatusNew || order.Status == model.WaybillStatusAccepted { // 饿百新运单事件要查询快递员信息，因为可能事件错序
if result, err := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID); err != nil {
globals.SugarLogger.Warnf("ebai onWaybillMsg orderID:%s OrderDeliveryGet failed with error:%v", order.VendorOrderID, err)
return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, order.VendorOrderID)