From 8f17ec1675e3353ed64c68bdaa58eda8f30f7839 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 30 Mar 2019 10:59:06 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=BC=BA=E5=88=B6=E5=8F=AC=E5=94=A4?= =?UTF-8?q?=E5=BF=BD=E7=95=A5=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch_ext.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 9df90e701..a48ba3596 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -75,7 +75,13 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor order := savedOrderInfo.order if forceCreate || (order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) { if forceCreate || !s.IsOrderHasWaybill(order) { - if bills, err = s.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, nil); err == nil { + var feeHandler func(deliveryFee, addFee int64) (err error) + if forceCreate { + feeHandler = func(deliveryFee, addFee int64) (err error) { + return nil + } + } + if bills, err = s.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, feeHandler); err == nil { if forceCreate { order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order)