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

1

Browse Source
This commit is contained in:
邹宗楠
2025-04-27 10:30:59 +08:00
parent 103197adf0
commit 42cbfcd8bb
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/partner/delivery/fn/waybill.go
View File

@@ -285,7 +285,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
if cc.PushTime == 0 { if cc.PushTime == 0 {
order.StatusTime = time.Now() order.StatusTime = time.Now()
} }
order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(cc.PartnerOrderCode) order.VendorOrderID = good.VendorOrderID
order.OrderVendorID = good.VendorID order.OrderVendorID = good.VendorID
store, _ := dao.GetStoreDetail(dao.GetDB(), good.JxStoreID, good.VendorID, good.VendorOrgCode) 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, VendorStatus: msg.AbnormalCode,
StatusTime: utils.Timestamp2Time(msg.AbnormalReportTime), 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") retVal = fnpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), "fn OnWaybillExcept")
}, jxutils.ComposeUniversalOrderID(msg.PartnerOrderCode, model.VendorIDFengNiao)) }, jxutils.ComposeUniversalOrderID(msg.PartnerOrderCode, model.VendorIDFengNiao))
return retVal return retVal

4
business/partner/delivery/mtps/waybill.go
View File

@@ -81,7 +81,9 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg
VendorStatus: utils.Int2Str(msg.ExceptionCode), VendorStatus: utils.Int2Str(msg.ExceptionCode),
StatusTime: utils.Timestamp2Time(msg.Timestamp), 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") retVal = mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), "mtps OnWaybillExcept")
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDDada)) }, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDDada))
return retVal return retVal

3
business/partner/delivery/sfps/waybill.go
View File

@@ -565,7 +565,8 @@ func OnWaybillExceptSF(msg *sfps2.RiderException) (retVal *sfps2.CallbackRespons
VendorStatus: utils.Float64ToStr(msg.OrderStatus), VendorStatus: utils.Float64ToStr(msg.OrderStatus),
StatusTime: utils.Timestamp2Time(int64(msg.PushTime)), 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)) retVal = sfps2.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order))
}, jxutils.ComposeUniversalOrderID(msg.ShopOrderID, model.VendorIDSFPS)) }, jxutils.ComposeUniversalOrderID(msg.ShopOrderID, model.VendorIDSFPS))
return retVal return retVal