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

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

@@ -70,7 +70,7 @@ class FreightLogic extends BaseLogic
                 $templateList[$good['express_template_id']][] = $good;
             }
         }
-
+        outFileLog($area_flag,'freight','$area_flag');
         if($area_flag == 1){
             outFileLog($good,'freight','$good');
             $expressPrice += isset($good['sub_price']) ?? 0;

+ 5 - 5
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){
+                $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{
+                    self::$orderPrice['express_price'] = 33;
+                }else{
                     $express_data = FreightLogic::calculateFreight($goodsLists, $userAddress);
                     self::$orderPrice['express_price'] = $express_data['express_price'];
                     $goodsLists = $express_data['goods'];
-//                }
+                }
 
             }