Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

This commit is contained in:
邹宗楠
2023-09-11 14:56:07 +08:00

View File

@@ -510,7 +510,9 @@ func OnWaybillExceptSF(msg *sfps2.RiderException) (retVal *sfps2.CallbackRespons
// GetWaybillByStatus 根据orderStatus 获取waybill结构
func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill {
globals.SugarLogger.Debugf("GetWaybillByStatus msg=%s", utils.Format4Output(msg, false))
waybill := &model.Waybill{}
switch urlIndex {
case sfps2.UrlIndexRiderStatus:
retVal := msg.(sfps2.RiderStatus)
@@ -543,7 +545,7 @@ func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill {
case sfps2.UrlIndexOrderComplete:
retVal := msg.(sfps2.OrderComplete)
waybill = &model.Waybill{
VendorWaybillID: retVal.SFOrderID,
VendorWaybillID: retVal.SfOrderID,
WaybillVendorID: model.VendorIDSFPS,
VendorOrderID: retVal.ShopOrderID,
CourierName: retVal.OperatorName,