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 15:53:45 +08:00
parent 660bfdabcb
commit 667c66f7c7
7 changed files with 90 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,12 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg
func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
order := c.callbackMsg2Waybill(msg)
if msg.Status == mtpsapi.OrderStatusPickedUp {
order.Status = model.WaybillStatusCourierArrived
mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 推送假的到店
msg.Status = mtpsapi.OrderStatusPickedUp
}
switch msg.Status {
case mtpsapi.OrderStatusWaitingForSchedule:
data, err := api.MtpsAPI.QueryOrderStatus(msg.DeliveryID, msg.MtPeisongID)
@@ -93,15 +99,15 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
}
order.DesiredFee = utils.Float64TwoInt64(utils.MustInterface2Float64(data["delivery_fee"]) * 100)
order.Status = model.WaybillStatusNew
case mtpsapi.OrderStatusAccepted:
case mtpsapi.OrderStatusAccepted: // 已接单
data, err := api.MtpsAPI.QueryOrderStatus(msg.DeliveryID, msg.MtPeisongID)
if err != nil {
return mtpsapi.Err2CallbackResponse(err, fmt.Sprintf("%s", "获取订单状态错误"))
}
order.DesiredFee = utils.Float64TwoInt64(utils.MustInterface2Float64(data["delivery_fee"]) * 100)
order.Status = model.WaybillStatusAccepted
order.Status = model.WaybillStatusCourierAssigned
order.Remark = order.CourierName + "，" + order.CourierMobile
case mtpsapi.OrderStatusPickedUp:
case mtpsapi.OrderStatusPickedUp: // 已取货
order.Status = model.WaybillStatusDelivering
case mtpsapi.OrderStatusDeliverred:
order.Status = model.WaybillStatusDelivered