liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 手工创建三方运单记录消息

Browse Source
This commit is contained in:
gazebo
2019-06-25 13:26:41 +08:00
parent 6559fb212e
commit 64e45962bf
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -115,6 +115,7 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex
err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order) err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
} }
if err == nil { 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 { if forceCreate {
s.stopTimer(savedOrderInfo) s.stopTimer(savedOrderInfo)
} }
@@ -124,6 +125,7 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex
} }
} }
if err != nil { 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) globals.SugarLogger.Debugf("CreateWaybillOnProviders4SavedOrder orderID:%s failed with error:%v", order.VendorOrderID, err)
} }
return nil, err return nil, err

4
business/partner/delivery/delivery.go
View File

@@ -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) { 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 { if policy == nil {
policy = NullCreateWaybillPolicy policy = NullCreateWaybillPolicy
} }
if errStr := policy(refDeliveryFee, refAddFee, deliveryFee); errStr != "" { if errStr := policy(refDeliveryFee, refAddFee, deliveryFee); errStr != "" {
waybillVendorName := jxutils.GetVendorName(waybillVendorID)
errStr = fmt.Sprintf("oderID:%s创建运单出错:%s", order.VendorOrderID, errStr) errStr = fmt.Sprintf("oderID:%s创建运单出错:%s", order.VendorOrderID, errStr)
globals.SugarLogger.Debugf("%s CallCreateWaybillPolicy failed with %s", waybillVendorName, errStr) globals.SugarLogger.Debugf("%s CallCreateWaybillPolicy failed with %s", waybillVendorName, errStr)
return errors.New(errStr) return errors.New(errStr)