|
|
@@ -167,7 +167,9 @@ class DeliveryQuoteUtil
|
|
|
$shConfig = $params['shConfig'] ?? [];
|
|
|
$sendCost = $params['sendCost'] ?? 0;
|
|
|
$sendDistance = $params['sendDistance'] ?? 0;
|
|
|
+ $sendDistanceKm = bcdiv($sendDistance, 1000, 2);
|
|
|
$freightType = $params['freightType'] ?? 0;
|
|
|
+ //0 花束 1 花材
|
|
|
$property = $params['property'] ?? 1;
|
|
|
$totalPrice = $params['totalPrice'] ?? 0;
|
|
|
$totalNum = $params['totalNum'] ?? 0;
|
|
|
@@ -185,7 +187,7 @@ class DeliveryQuoteUtil
|
|
|
$freeKm = (float)($rule['freeKm'] ?? 0);
|
|
|
|
|
|
// 校验规则:金额满 meetAmount 且 数量满 meetNum 且 距离在 freeKm 以内
|
|
|
- if ($totalPrice >= $meetAmount && $totalNum >= $meetNum && $sendDistance <= $freeKm) {
|
|
|
+ if ($totalPrice >= $meetAmount && $totalNum >= $meetNum && $sendDistanceKm <= $freeKm) {
|
|
|
return ['sendCost' => 0];
|
|
|
}
|
|
|
}
|