From dab32bbe0e3937ff0764634bb193b5cbced85efb Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 6 Aug 2019 10:22:05 +0800 Subject: [PATCH] =?UTF-8?q?-=20SelfDeliveringAndUpdateStatus=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch_ext.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 2bfff6f67..d6f50c460 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -23,12 +23,13 @@ func (s *DefScheduler) loadSavedOrderByID(vendorOrderID string, vendorID int, is } func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) { + var order *model.GoodsOrder jxutils.CallMsgHandler(func() { err = func() (err error) { globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true) if savedOrderInfo != nil { - order := savedOrderInfo.order + order = savedOrderInfo.order if err = s.isPossibleSwitch2SelfDelivery(order); err == nil { err = s.cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) if err == nil { @@ -60,12 +61,23 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven } } } else { + order = &model.GoodsOrder{ + VendorOrderID: vendorOrderID, + VendorID: vendorID, + } err = scheduler.ErrCanNotFindOrder } globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err) return err }() }, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID)) + vendorStatus := fmt.Sprintf("%s转商户自送成功", ctx.GetUserName()) + remark := "" + if err != nil { + vendorStatus = fmt.Sprintf("%s转商户自送失败", ctx.GetUserName()) + remark = err.Error() + } + partner.CurOrderManager.OnOrderMsg(order, vendorStatus, remark) return err }