1
This commit is contained in:
@@ -332,12 +332,14 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
|
||||
}
|
||||
|
||||
if maxDeliveryFee == model.NO {
|
||||
fee, err := c.GetWaybillFee(order)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if fee.DeliveryFee >= model.DefMaxDeliveryFee {
|
||||
return nil, fmt.Errorf("美团配送超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee))
|
||||
if order.EarningType != model.EarningTypePoints {
|
||||
fee, err := c.GetWaybillFee(order)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if fee.DeliveryFee >= model.DefMaxDeliveryFee {
|
||||
return nil, fmt.Errorf("美团配送超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user