1

business/partner/delivery/mtps/waybill.go

@@ -316,11 +316,10 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
 	deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = api.MtpsAPI.PreCreateByShop(param)
 	deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee
 
-	globals.SugarLogger.Debugf("=============deliveryFeeInfo := %s", utils.Format4Output(deliveryFeeInfo, false))
 	return deliveryFeeInfo, err
 }
 
-// CreateWaybill（美团配送）
+// CreateWaybill （美团配送）
 func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) {
 	db := dao.GetDB()
 	// 检查配送平台是否被禁用
@@ -332,16 +331,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 		return nil, fmt.Errorf("此平台配送已被系统关闭，暂不发配送 [%v]", vendorOrgCode[0].Comment)
 	}
 
-	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))
-		}
-	}
-
 	// 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出
 	lngFloat, latFloat, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
 	billParams := &mtpsapi.CreateOrderByShopParam{

business/partner/partner.go

@@ -75,6 +75,7 @@ var (
 	CancelWaybillReasonStrActive               = "操作由人员主动发起"
 	CancelWaybillReasonNotInStoreOpenTime      = "不在门店的营业时间范围内"
 	CancelWaybillReasonStrDYPSCancel           = "抖音门店转自送，取消自动运力"
+	CancelWaybillReasonStrDeliveryFeeUp        = "配送距离太远,配送费超过15元"
 )
 
 var (