diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 6a6c128ac..7df1114e8 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -285,7 +285,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta if cc.PushTime == 0 { order.StatusTime = time.Now() } - order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(cc.PartnerOrderCode) + order.VendorOrderID = good.VendorOrderID order.OrderVendorID = good.VendorID store, _ := dao.GetStoreDetail(dao.GetDB(), good.JxStoreID, good.VendorID, good.VendorOrgCode) @@ -400,7 +400,8 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *fnpsapi.AbnormalReportNotify) (re VendorStatus: msg.AbnormalCode, StatusTime: utils.Timestamp2Time(msg.AbnormalReportTime), } - order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.PartnerOrderCode) + good, _ := dao.GetSimpleOrder(dao.GetDB(), msg.PartnerOrderCode) + order.VendorOrderID, order.OrderVendorID = good.VendorOrderID, good.VendorID retVal = fnpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), "fn OnWaybillExcept") }, jxutils.ComposeUniversalOrderID(msg.PartnerOrderCode, model.VendorIDFengNiao)) return retVal diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 5a3e7a698..914b81289 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -81,7 +81,9 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg VendorStatus: utils.Int2Str(msg.ExceptionCode), StatusTime: utils.Timestamp2Time(msg.Timestamp), } - order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID) + + goods, _ := dao.GetSimpleOrder(dao.GetDB(), msg.OrderID) + order.VendorOrderID, order.OrderVendorID = goods.VendorOrderID, goods.VendorID retVal = mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), "mtps OnWaybillExcept") }, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDDada)) return retVal diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 25811eee8..0f4a1af40 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -565,7 +565,8 @@ func OnWaybillExceptSF(msg *sfps2.RiderException) (retVal *sfps2.CallbackRespons VendorStatus: utils.Float64ToStr(msg.OrderStatus), StatusTime: utils.Timestamp2Time(int64(msg.PushTime)), } - order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.ShopOrderID) + goods, _ := dao.GetSimpleOrder(dao.GetDB(), msg.ShopOrderID) + order.VendorOrderID, order.OrderVendorID = goods.VendorOrderID, goods.VendorID retVal = sfps2.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order)) }, jxutils.ComposeUniversalOrderID(msg.ShopOrderID, model.VendorIDSFPS)) return retVal