From 3f1045530d9d4fc9c01a40b52406b86fa3882b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 Jan 2021 10:14:25 +0800
Subject: [PATCH] aa

---
 business/jxcallback/scheduler/defsch/defsch.go | 1 +
 business/partner/delivery/dada/waybill.go      | 1 +
 business/partner/delivery/fn/waybill.go        | 1 +
 business/partner/delivery/mtps/waybill.go      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index b31546ab6..d4a739864 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -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) {
 	globals.SugarLogger.Debugf("ProxyCancelWaybill orderID:%s", order.VendorOrderID)
+
 	if (order.DeliveryFlag & model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {
 		if err = s.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil {
 			partner.CurOrderManager.OnOrderMsg(order, "取消三方运单失败", err.Error())
diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go
index dee857fb6..63995afb4 100644
--- a/business/partner/delivery/dada/waybill.go
+++ b/business/partner/delivery/dada/waybill.go
@@ -76,6 +76,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
 		order.Status = model.WaybillStatusNew
 	case dadaapi.OrderStatusAccepted:
 		order.Status = model.WaybillStatusAccepted
+		order.Remark = order.CourierName + "，" + order.CourierMobile
 	case dadaapi.OrderStatusDelivering:
 		order.Status = model.WaybillStatusDelivering
 	case dadaapi.OrderStatusFinished:
diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go
index d4a6668ea..84627b1d8 100644
--- a/business/partner/delivery/fn/waybill.go
+++ b/business/partner/delivery/fn/waybill.go
@@ -185,6 +185,7 @@ func OnWaybillMsg(msg *fnpsapi.WayBillInfo) {
 	case fnpsapi.OrderStatusAssigned:
 		order.DesiredFee = GetDesiredFee(order.VendorOrderID)
 		order.Status = model.WaybillStatusAccepted
+		order.Remark = order.CourierName + "，" + order.CourierMobile
 	case fnpsapi.OrderStatusArrived:
 		order.DesiredFee = GetDesiredFee(order.VendorOrderID)
 		order.Status = model.WaybillStatusCourierArrived
diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index bdb727f75..f7a300f6e 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -94,6 +94,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
 	case mtpsapi.OrderStatusAccepted:
 		order.DesiredFee, _ = delivery.CalculateBillDeliveryFee(order) // 美团外卖可能会丢失新运单事件，这里补一下
 		order.Status = model.WaybillStatusAccepted
+		order.Remark = order.CourierName + "，" + order.CourierMobile
 	case mtpsapi.OrderStatusPickedUp:
 		order.Status = model.WaybillStatusDelivering
 	case mtpsapi.OrderStatusDeliverred: