From 64e45962bfac12ce572ae475273a78b2b80ecf13 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 25 Jun 2019 13:26:41 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=89=8B=E5=B7=A5=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E8=BF=90=E5=8D=95=E8=AE=B0=E5=BD=95=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch_ext.go | 2 ++ business/partner/delivery/delivery.go | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index c7b2b5f4a..8908b3bc8 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -115,6 +115,7 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order) } if err == nil { + partner.CurOrderManager.OnOrderMsg(order, "手动创建运单成功", fmt.Sprintf("%s创建%s平台运单,强发:%t,最高加价:%d,最高差价:%d", ctx.GetUserName(), model.VendorChineseNames[bills[0].WaybillVendorID], forceCreate, maxAddFee, maxDiffFee2Mtps)) if forceCreate { s.stopTimer(savedOrderInfo) } @@ -124,6 +125,7 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex } } if err != nil { + partner.CurOrderManager.OnOrderMsg(order, "手动创建运单失败", fmt.Sprintf("%s创建%s平台运单,强发:%t,最高加价:%d,最高差价:%d,err:%v", ctx.GetUserName(), model.VendorChineseNames[bills[0].WaybillVendorID], forceCreate, maxAddFee, maxDiffFee2Mtps, err)) globals.SugarLogger.Debugf("CreateWaybillOnProviders4SavedOrder orderID:%s failed with error:%v", order.VendorOrderID, err) } return nil, err diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go index 7c366da13..60e82ff35 100644 --- a/business/partner/delivery/delivery.go +++ b/business/partner/delivery/delivery.go @@ -56,11 +56,13 @@ func AddPolicy(prevPolicy, newPolicy partner.CreateWaybillPolicy) (outPolicy par } func CallCreateWaybillPolicy(policy partner.CreateWaybillPolicy, refDeliveryFee, refAddFee, deliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) { + waybillVendorName := jxutils.GetVendorName(waybillVendorID) + globals.SugarLogger.Debugf("CallCreateWaybillPolicy orderID:%s, refDeliveryFee:%d, refAddFee:%d, deliveryFee:%d, waybillVendor:%s", + order.VendorOrderID, refDeliveryFee, refAddFee, deliveryFee, waybillVendorName) if policy == nil { policy = NullCreateWaybillPolicy } if errStr := policy(refDeliveryFee, refAddFee, deliveryFee); errStr != "" { - waybillVendorName := jxutils.GetVendorName(waybillVendorID) errStr = fmt.Sprintf("oderID:%s创建运单出错:%s", order.VendorOrderID, errStr) globals.SugarLogger.Debugf("%s CallCreateWaybillPolicy failed with %s", waybillVendorName, errStr) return errors.New(errStr)