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

- fix bug in dada.CreateWaybill

Browse Source
This commit is contained in:
gazebo
2019-01-31 10:43:38 +08:00
parent 5ca5ed3a1b
commit b6f7921b76
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
business/partner/delivery/dada/waybill.go
View File

@@ -144,12 +144,12 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del
AND waybill_vendor_id = ?
`, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), model.VendorIDDada).ValuesList(&lists)
var result *dadaapi.CreateOrderResponse
if err2 == nil && num > 0 {
if err = err2; err == nil && num > 0 {
globals.SugarLogger.Debugf("CreateWaybill orderID:%s num=%d use ReaddOrder", order.VendorOrderID, num)
result, err = api.DadaAPI.ReaddOrder(billParams, addParams)
} else {
if err2 != nil {
globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err2)
if err != nil {
globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err)
}
if false {
result, err = api.DadaAPI.AddOrder(billParams, addParams)
@@ -157,8 +157,9 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del
if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil {
return nil, err
}
if jxutils.StandardPrice2Int(result.Fee)-deliveryFee > maxDiffFee2Mtps {
globals.SugarLogger.Infof("CreateWaybill orderID:%s 达达与美团配送超价太多，达达:%d，美团配送:%d", order.VendorOrderID, result.Fee, deliveryFee)
dadaFee := jxutils.StandardPrice2Int(result.Fee)
if dadaFee-deliveryFee > maxDiffFee2Mtps {
globals.SugarLogger.Infof("CreateWaybill orderID:%s 达达与美团配送超价太多，达达:%d，美团配送:%d", order.VendorOrderID, dadaFee, deliveryFee)
return nil, ErrExceedMaxDiffFee2Mtps
}
err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
@@ -169,7 +170,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del
VendorOrderID: order.VendorOrderID,
OrderVendorID: order.VendorID,
WaybillVendorID: model.VendorIDDada,
DesiredFee: jxutils.StandardPrice2Int(result.DeliverFee),
DesiredFee: deliveryFee,
ActualFee: jxutils.StandardPrice2Int(result.Fee),
}
}