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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-01-21 10:14:25 +08:00
parent f3f091f6ab
commit 3f1045530d
4 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -1469,6 +1469,7 @@ func (s *DefScheduler) isBillCandidate(order *model.GoodsOrder, bill *model.Wayb
func (s *DefScheduler) ProxyCancelWaybill(order *model.GoodsOrder, bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) { func (s *DefScheduler) ProxyCancelWaybill(order *model.GoodsOrder, bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
globals.SugarLogger.Debugf("ProxyCancelWaybill orderID:%s", order.VendorOrderID) globals.SugarLogger.Debugf("ProxyCancelWaybill orderID:%s", order.VendorOrderID)
if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 { if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {
if err = s.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil { if err = s.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "取消三方运单失败", err.Error()) partner.CurOrderManager.OnOrderMsg(order, "取消三方运单失败", err.Error())

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

@@ -76,6 +76,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
order.Status = model.WaybillStatusNew order.Status = model.WaybillStatusNew
case dadaapi.OrderStatusAccepted: case dadaapi.OrderStatusAccepted:
order.Status = model.WaybillStatusAccepted order.Status = model.WaybillStatusAccepted
order.Remark = order.CourierName + "，" + order.CourierMobile
case dadaapi.OrderStatusDelivering: case dadaapi.OrderStatusDelivering:
order.Status = model.WaybillStatusDelivering order.Status = model.WaybillStatusDelivering
case dadaapi.OrderStatusFinished: case dadaapi.OrderStatusFinished:

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

@@ -185,6 +185,7 @@ func OnWaybillMsg(msg *fnpsapi.WayBillInfo) {
case fnpsapi.OrderStatusAssigned: case fnpsapi.OrderStatusAssigned:
order.DesiredFee = GetDesiredFee(order.VendorOrderID) order.DesiredFee = GetDesiredFee(order.VendorOrderID)
order.Status = model.WaybillStatusAccepted order.Status = model.WaybillStatusAccepted
order.Remark = order.CourierName + "，" + order.CourierMobile
case fnpsapi.OrderStatusArrived: case fnpsapi.OrderStatusArrived:
order.DesiredFee = GetDesiredFee(order.VendorOrderID) order.DesiredFee = GetDesiredFee(order.VendorOrderID)
order.Status = model.WaybillStatusCourierArrived order.Status = model.WaybillStatusCourierArrived

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

@@ -94,6 +94,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
case mtpsapi.OrderStatusAccepted: case mtpsapi.OrderStatusAccepted:
order.DesiredFee, _ = delivery.CalculateBillDeliveryFee(order) // 美团外卖可能会丢失新运单事件，这里补一下 order.DesiredFee, _ = delivery.CalculateBillDeliveryFee(order) // 美团外卖可能会丢失新运单事件，这里补一下
order.Status = model.WaybillStatusAccepted order.Status = model.WaybillStatusAccepted
order.Remark = order.CourierName + "，" + order.CourierMobile
case mtpsapi.OrderStatusPickedUp: case mtpsapi.OrderStatusPickedUp:
order.Status = model.WaybillStatusDelivering order.Status = model.WaybillStatusDelivering
case mtpsapi.OrderStatusDeliverred: case mtpsapi.OrderStatusDeliverred: