moonsflyer 3 месяцев назад
Родитель
Сommit
4a67f45de9

+ 1 - 0
app/shopapi/logic/Order/FreightLogic.php

@@ -174,6 +174,7 @@ class FreightLogic extends BaseLogic
     //特定地区运费计算
     public static function calculate2($data, $userAddress)
     {
+        return 109;
         $goods_price=0;
         foreach ($data as &$v){
             $goods_price +=$v['sub_price'];

+ 6 - 6
app/shopapi/logic/Order/OrderLogic.php

@@ -176,15 +176,15 @@ class OrderLogic extends BaseLogic
             if ($params['delivery_type'] == DeliveryEnum::SELF_DELIVERY) {
                 self::$orderPrice['express_price'] = 0;
             } else {
-                $area_flag =  ConfigService::get('shop', 'area_flag');
-                if($area_flag==1){
-                    $express_data = FreightLogic::calculateFreight($goodsLists, $userAddress);
-                    self::$orderPrice['express_price'] = $express_data['express_price'];
-                }else{
+//                $area_flag =  ConfigService::get('shop', 'area_flag');
+//                if($area_flag==1){
+//                    $express_data = FreightLogic::calculateFreight($goodsLists, $userAddress);
+//                    self::$orderPrice['express_price'] = $express_data['express_price'];
+//                }else{
                     $express_data = FreightLogic::calculateFreight($goodsLists, $userAddress);
                     self::$orderPrice['express_price'] = $express_data['express_price'];
                     $goodsLists = $express_data['goods'];
-                }
+//                }
 
             }