|
@@ -219,6 +219,8 @@ class PurchaseClass extends BaseClass
|
|
|
//计算距离和运费【另外还有个地方要同步修改,关键词calc_freight_distance】 ssh 20221003
|
|
//计算距离和运费【另外还有个地方要同步修改,关键词calc_freight_distance】 ssh 20221003
|
|
|
public static function getDistanceFee($shop, $ghsShop, $weight)
|
|
public static function getDistanceFee($shop, $ghsShop, $weight)
|
|
|
{
|
|
{
|
|
|
|
|
+ return ['distance' => 0, 'showDistance' => 0, 'fee' => 0];
|
|
|
|
|
+
|
|
|
$shopLat = isset($shop->lat) ? $shop->lat : '';
|
|
$shopLat = isset($shop->lat) ? $shop->lat : '';
|
|
|
$shopLong = isset($shop->long) ? $shop->long : '';
|
|
$shopLong = isset($shop->long) ? $shop->long : '';
|
|
|
|
|
|
|
@@ -295,8 +297,6 @@ class PurchaseClass extends BaseClass
|
|
|
if ($ghsShop->id == 12003) {
|
|
if ($ghsShop->id == 12003) {
|
|
|
return ['distance' => 0, 'showDistance' => 0, 'fee' => 0];
|
|
return ['distance' => 0, 'showDistance' => 0, 'fee' => 0];
|
|
|
}
|
|
}
|
|
|
- return ['distance' => 0, 'showDistance' => 0, 'fee' => 0];
|
|
|
|
|
-
|
|
|
|
|
return ['distance' => $distance, 'showDistance' => $showDistance, 'fee' => $totalFee];
|
|
return ['distance' => $distance, 'showDistance' => $showDistance, 'fee' => $totalFee];
|
|
|
}
|
|
}
|
|
|
|
|
|