From 07f6b9d340688a80385bd8a5bb9a0a6d0cdd6941 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 9 Apr 2019 17:10:07 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E7=94=A8SelfDeliverDelivering?= =?UTF-8?q?=E8=A6=81=E4=BC=A0=E9=AA=91=E6=89=8B=E6=88=96=E5=BA=97=E4=B8=BB?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 4 ++-- business/jxcallback/scheduler/defsch/defsch_ext.go | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index d7208cf88..f22717ac9 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -351,12 +351,12 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo s.cancelOtherWaybills(savedOrderInfo, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) if !s.IsOrderPlatformWaybill(bill) { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { - s.SelfDeliverDelivering(savedOrderInfo.order, "") + s.SelfDeliverDelivering(savedOrderInfo.order, bill.CourierMobile) } else { s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, 2, 10*time.Second) } } else if s.IsSpecialOrderPlatformWaybill(bill) { - s.SelfDeliverDelivering(savedOrderInfo.order, "") + s.SelfDeliverDelivering(savedOrderInfo.order, bill.CourierMobile) } } else if !s.isBillCandidate(order, bill) && bill.WaybillVendorID != order.VendorID { // 发生这种情况的原因就是两个接单事件几乎同时到达（来不及取消），也算正常 diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 2712c97bc..33cda68f8 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -4,6 +4,7 @@ import ( "fmt" "time" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner/delivery" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" @@ -31,7 +32,12 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven if true { //order.DeliveryFlag&model.OrderDeliveryFlagMaskPurcahseDisabled == 0 { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { if order.Status <= model.OrderStatusFinishedPickup { - err = s.SelfDeliverDelivering(order, userName) + storeDetail, err2 := dao.GetStoreDetail(dao.GetDB(), order.StoreID, order.VendorID) + phone := userName + if err = err2; err == nil { + phone = storeDetail.Tel1 + } + err = s.SelfDeliverDelivering(order, phone) } } else { if order.Status <= model.OrderStatusFinishedPickup {