1
This commit is contained in:
@@ -287,7 +287,6 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
|
||||
return nil, errCode, err
|
||||
}
|
||||
}
|
||||
globals.SugarLogger.Debugf("============maxDeliveryFee := %d", maxDeliveryFee)
|
||||
excludeCourierVendorIDs := make([]int, 0, 0)
|
||||
allDelivery := map[int]int{model.VendorIDFengNiao: 1, model.VendorIDDada: 1, model.VendorIDMTPS: 1, model.VendorIDUUPT: 1, model.VendorIDSFPS: 1}
|
||||
for _, v := range courierVendorIDs {
|
||||
|
||||
@@ -367,8 +367,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
|
||||
return nil, err
|
||||
}
|
||||
|
||||
globals.SugarLogger.Debugf("===========CallCreateWaybillPolicy=== := %d", maxDeliveryFee)
|
||||
globals.SugarLogger.Debugf("===========waybillList[0].ActualFee=== := %d", waybillList[0].ActualFee)
|
||||
// 检查两天内是否有订单
|
||||
var result *dadaapi.CreateOrderResponse
|
||||
if len(waybillList) > 0 && waybillList[0].Status != model.WaybillStatusFailed {
|
||||
|
||||
@@ -21,6 +21,9 @@ const (
|
||||
)
|
||||
|
||||
func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) {
|
||||
if maxDeliveryFee != model.NO {
|
||||
return nil
|
||||
}
|
||||
if maxDeliveryFee <= model.DefMaxDeliveryFee {
|
||||
maxDeliveryFee = model.DefMaxDeliveryFee
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user