Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/partner/delivery/dada/waybill.go

@@ -394,6 +394,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 			return nil, err
 		}
 	}
+
 	if result == nil {
 		return nil, errors.New("达达配送,平台调用错误,无订单数据返回")
 	}

business/partner/delivery/delivery.go

@@ -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
 	}

business/partner/delivery/mtps/waybill.go

@@ -319,7 +319,7 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
 	return deliveryFeeInfo, err
 }
 
-// CreateWaybill（美团配送）
+// CreateWaybill （美团配送）
 func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) {
 	db := dao.GetDB()
 	// 检查配送平台是否被禁用
@@ -331,17 +331,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 		return nil, fmt.Errorf("此平台配送已被系统关闭，暂不发配送 [%v]", vendorOrgCode[0].Comment)
 	}
 
-	globals.SugarLogger.Debugf("===================maxDeliveryFee := %d", 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))
-		}
-	}
-
 	// 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出
 	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 (

business/partner/purchase/ebai/order.go

@@ -796,7 +796,7 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G
 }
 
 func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) {
-	return fmt.Errorf("饿了么暂无投诉骑手API")
+	return fmt.Errorf("饿了么暂无投诉骑手,请联系饿了么客服")
 }
 
 // 转自配送时取消非专送混合送门店取消理由

business/partner/purchase/jdshop/order.go

@@ -311,7 +311,7 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, vendorOrgCode strin
 }
 
 func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) {
-	return err
+	return fmt.Errorf("暂无投诉渠道,请致电京东客服")
 }
 
 // 转自配送时取消非专送混合送门店取消理由

business/partner/purchase/mtwm/order.go

@@ -537,7 +537,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 
 	// 美团专送、快送、混合送、美团企客
 	logisticsCode := utils.Interface2String(orderDetail["logistics_code"])
-	isSelfDelivery = logisticsCode == mtwmapi.PeiSongTypeMTZSJM || logisticsCode == mtwmapi.PeiSongTypeMTZSZJ || logisticsCode == mtwmapi.PeiSongTypeKuaiDi || logisticsCode == mtwmapi.PeiSongTypeMixed || logisticsCode == mtwmapi.PeiSongTypeQiKe
+	isSelfDelivery = logisticsCode == mtwmapi.PeiSongTypeMTZSJM || logisticsCode == mtwmapi.PeiSongTypeMTZSZJ || logisticsCode == mtwmapi.PeiSongTypeKuaiDi || logisticsCode == mtwmapi.PeiSongTypeMixed || logisticsCode == mtwmapi.PeiSongTypeQiKe || logisticsCode == mtwmapi.PeiSongTypeMixedExpressQiKe
 	//1001-专送（加盟）；1002-专送（自建）
 	//2002-快送；3001-混合送（专送+快送)
 	//4015-企客远距离配送
@@ -554,6 +554,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 	//PeiSongTypeKuaiDi    = "2002" // 快送
 	//PeiSongTypeWholeCity = "2010" // 全城送
 	//PeiSongTypeMixed     = "3001" // 混合送（即美团专送+快送）
+	//PeiSongTypeMixedExpressQiKe     = "30012002" // 混合送（混合快送）
 	if isSelfDelivery {
 		err = api.PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
 	}

business/partner/purchase/tiktok_store/order.go

@@ -990,7 +990,7 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G
 }
 
 func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) {
-	return fmt.Errorf("抖店暂不提供投诉骑手API")
+	return fmt.Errorf("抖店暂不提供投诉骑手API,联系客服")
 }
 
 // GetCancelDeliveryReason 转自配送时取消非专送混合送门店取消理由