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:
邹宗楠
2022-11-02 19:27:17 +08:00
parent 314c52aff2
commit 04cd4c2b86
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/delivery/dada/waybill.go
View File

@@ -71,10 +71,12 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
order := c.callbackMsg2Waybill(msg) order := c.callbackMsg2Waybill(msg)
switch msg.OrderStatus { switch msg.OrderStatus {
case dadaapi.OrderStatusWaitingForAccept: case dadaapi.OrderStatusWaitingForAccept:
if dadaOrder, err := api.DadaAPI.QueryOrderInfo(msg.OrderID); err == nil { dadaOrder, err := api.DadaAPI.QueryOrderInfo(msg.OrderID)
if err == nil {
order.ActualFee = jxutils.StandardPrice2Int(dadaOrder.ActualFee) order.ActualFee = jxutils.StandardPrice2Int(dadaOrder.ActualFee)
order.DesiredFee = jxutils.StandardPrice2Int(dadaOrder.DeliveryFee) order.DesiredFee = jxutils.StandardPrice2Int(dadaOrder.DeliveryFee)
} }
globals.SugarLogger.Debugf("onWaybillMsg====dadaOrder=============:%s", utils.Format4Output(dadaOrder, false))
order.Status = model.WaybillStatusNew order.Status = model.WaybillStatusNew
case dadaapi.OrderStatusAccepted: case dadaapi.OrderStatusAccepted:
order.Status = model.WaybillStatusCourierAssigned order.Status = model.WaybillStatusCourierAssigned
@@ -440,6 +442,8 @@ func (c *DeliveryHandler) GetRidderPosition(ctx *jxcontext.Context, vendorOrgCod
// 获取骑手信息(订单详情) // 获取骑手信息(订单详情)
func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *mtpsapi.RiderInfo, err error) { func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *mtpsapi.RiderInfo, err error) {
order, err := api.DadaAPI.QueryOrderInfo(orderId) order, err := api.DadaAPI.QueryOrderInfo(orderId)
globals.SugarLogger.Debugf("order111111111111 := %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("order111111111111 := %s", utils.Format4Output(err, false))
if err != nil { if err != nil {
return nil, err return nil, err
} }