合并冲突

app/admin/service/FengsuService.php

@@ -43,9 +43,9 @@ class FengsuService {
                 $status = 3;
                 if($weight){
                     // dump('店铺3');
-                    
+
                     $other_price = JuShuiTanService::getRemoteAreaFee($item['tradeOrderPrintVos'][0]['companyName'],  $weight, $item['receiverProvince'], $item['receiverCity']);
-                    
+
                     // 保温加收价格
                     $getPackSpecsFee=JuShuiTanService::getPackSpecsFee($sku,$item['shopId'], $item['tradeOrderPrintVos'][0]['skuId'],$item['receiverProvince']);
                     $pack_specs=strval($getPackSpecsFee['surcharge_money']);
@@ -112,6 +112,28 @@ class FengsuService {
         return $data;
     }
 
-    
-
+    /**
+     * 获取偏远地区加收费用
+     * @param string $express 快递公司名称
+     * @param string $area 省份
+     * @param float $weight 重量
+     * @param string $city 城市
+     * @return float
+     */
+    protected static function getRemoteAreaFee(string $express, string $weight, string $area, string $city = ''){
+        $remote_area = config('app.remote_area');
+        $fee = 0;
+        if($express == '顺丰快递'){
+            if(in_array($area, $remote_area[1])) {
+                if($weight >= 3.5) $fee = 5;
+                if($weight >= 4.5) $fee = 6;
+            };
+        }else{
+            //普通(广东省-深圳) -浙江-舟山
+            if(in_array($area, $remote_area[0])) $fee = 1.5;
+            if($area == '广东省' && $city == '深圳市') $fee = 1.5;
+            if($area == '浙江省' && $city == '舟山市') $fee = 1.5;
+        }
+        return $fee;
+    }
 }

app/api/controller/Worker.php

@@ -40,6 +40,24 @@ class Worker extends Base
         $data = [];
         $data['today'] = ScanLog::where('user_id', $this->userinfo['id'])->whereTime('createtime', 'today')->count();
         $data['yesterday'] = ScanLog::where('user_id', $this->userinfo['id'])->whereTime('createtime', 'yesterday')->count();
+        $data['pack_specs'] = [
+            [
+                'pack_name' => '三斤',
+                'pack_count' => '120',
+                'pack_money' => '100'
+            ],
+            [
+                'pack_name' => '五斤',
+                'pack_count' => '120',
+                'pack_money' => '100'
+            ],
+            [
+                'pack_name' => '五斤保温',
+                'pack_count' => '120',
+                'pack_money' => '100'
+            ],
+
+        ];
         $this->success('ok', $data);
     }