jdwl nil问题
This commit is contained in:
@@ -1446,8 +1446,9 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
|
|||||||
waybill = v
|
waybill = v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
handler := partner.DeliveryPlatformHandlers[waybill.WaybillVendorID]
|
if handler := partner.GetDeliveryPlatformFromVendorID(model.VendorIDJDWL); handler != nil {
|
||||||
err = handler.Handler.CancelWaybill(waybill, 0, "订单已发送其他物流")
|
err = handler.Handler.CancelWaybill(waybill, 0, "订单已发送其他物流")
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -1503,12 +1504,13 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
|
|||||||
dao.UpdateEntity(db, order, "EclpOutID")
|
dao.UpdateEntity(db, order, "EclpOutID")
|
||||||
vendorWaybillID = eclpSoNo
|
vendorWaybillID = eclpSoNo
|
||||||
} else {
|
} else {
|
||||||
handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL]
|
if handler := partner.GetDeliveryPlatformFromVendorID(model.VendorIDJDWL); handler != nil {
|
||||||
waybill2, err := handler.Handler.CreateWaybill(order, 0)
|
waybill2, err := handler.Handler.CreateWaybill(order, 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
}
|
||||||
|
vendorWaybillID = waybill2.VendorWaybillID
|
||||||
}
|
}
|
||||||
vendorWaybillID = waybill2.VendorWaybillID
|
|
||||||
}
|
}
|
||||||
jdshop.CurPurchaseHandler.OrderExport(ctx, vendorOrderID, vendorWaybillID, false)
|
jdshop.CurPurchaseHandler.OrderExport(ctx, vendorOrderID, vendorWaybillID, false)
|
||||||
return err
|
return err
|
||||||
|
|||||||
Reference in New Issue
Block a user