This commit is contained in:
邹宗楠
2022-03-31 09:09:50 +08:00
parent 54d4ad2fb0
commit 9b0a2d08b6
3 changed files with 21 additions and 40 deletions

View File

@@ -187,16 +187,16 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
}
// 订单状态
func OnWaybillMsg(msg map[string]interface{}) (resp *fnpsapi.CallbackResponse) {
func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) {
order := &model.Waybill{
VendorWaybillID: utils.Interface2String(msg["open_order_code"]),
VendorWaybillID2: utils.Interface2String(msg["partner_order_code"]),
VendorWaybillID: utils.Interface2String(msg.Param.PartnerOrderCode),
VendorWaybillID2: utils.Interface2String(msg.Param.OrderId),
WaybillVendorID: model.VendorIDFengNiao,
CourierName: utils.Interface2String(msg["carrier_driver_name"]),
CourierMobile: utils.Interface2String(msg["carrier_driver_phone"]),
VendorStatus: utils.Interface2String(msg["order_status"]),
StatusTime: utils.Timestamp2Time(utils.MustInterface2Int64(msg["push_time"])),
Remark: utils.Interface2String(msg["description"]),
CourierName: utils.Interface2String(msg.Param.CarrierDriverName),
CourierMobile: utils.Interface2String(msg.Param.CarrierDriverPhone),
VendorStatus: utils.Interface2String(msg.Param.OrderStatus),
StatusTime: utils.Timestamp2Time(utils.MustInterface2Int64(msg.Param.PushTime)),
Remark: utils.Interface2String(msg.Param.Description),
}
order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(order.VendorWaybillID2)
orderStatus, err := strconv.Atoi(order.VendorStatus)