|
|
@@ -53,7 +53,7 @@ class FreightLogic extends BaseLogic
|
|
|
if (empty($userAddress) || $expressConfig == YesNoEnum::NO) {
|
|
|
return ['goods'=>$goods,'express_price'=>$expressPrice];
|
|
|
}
|
|
|
-
|
|
|
+ $area_flag = ConfigService::get('shop', 'area_flag');
|
|
|
foreach ($goods as &$good) {
|
|
|
|
|
|
$good['total_weight'] = $good['weight'] * $good['goods_num'];
|
|
|
@@ -70,9 +70,9 @@ class FreightLogic extends BaseLogic
|
|
|
$templateList[$good['express_template_id']][] = $good;
|
|
|
}
|
|
|
}
|
|
|
- $area_flag = ConfigService::get('shop', 'area_flag');
|
|
|
+
|
|
|
if($area_flag == 1){
|
|
|
- $expressPrice += 11;//self::calculate2($goods, $userAddress);
|
|
|
+ $expressPrice += $good['sub_price'];//self::calculate2($goods, $userAddress);
|
|
|
}else {
|
|
|
|
|
|
|