追踪件修改 应送达时间自动填充以时间表作为参数 顺丰前缀的

app/Http/Controllers/TestController.php

@@ -633,340 +633,4 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         dd(Request::all());
     }
 
-    public function test11()
-    {
-
-    }
-
-    public function addLogisticTiming()
-    {
-        $orderHeader =OracleDOCOrderHeader::query()->where('orderNo','SO201015004279')->first();
-        $orderHeader['c_city'] = '晋城';
-        $orderHeader['c_province'] = '山西';
-        $order = Order::query()->with('logistic')->where('code','SO201015004279')->first();
-        $params =app(OrderTrackingService::class)->getParamsByOrderHeaderAndOrder($orderHeader,$order);
-        dd($params['pick_up_at'],$orderHeader['lastshipmenttime']);
-    }
-
-    public function getMap()
-    {
-        return [['北京','北京','4','5'],
-            ['广东','广州','4','5'],
-            ['上海','上海','2','3'],
-            ['天津','天津','4','5'],
-            ['重庆','重庆','4','5'],
-            ['辽宁','沈阳','4','5'],
-            ['江苏','南京','2','3'],
-            ['湖北','武汉','4','5'],
-            ['四川','成都','5','6'],
-            ['陕西','西安','4','5'],
-            ['贵州','遵义','5','6'],
-            ['贵州','安顺','5','6'],
-            ['云南','泸水','5','6'],
-            ['云南','丽江','5','6'],
-            ['河北','邯郸','4','5'],
-            ['河北','石家庄','4','5'],
-            ['河北','保定','4','5'],
-            ['河北','张家口','4','5'],
-            ['河北','承德','4','5'],
-            ['河北','唐山','4','5'],
-            ['河北','廊坊','4','5'],
-            ['河北','沧州','4','5'],
-            ['河北','衡水','5','6'],
-            ['河北','邢台','4','5'],
-            ['河北','秦皇岛','4','5'],
-            ['山西','朔州','5','6'],
-            ['山西','忻州','4','5'],
-            ['山西','太原','4','5'],
-            ['山西','大同','4','5'],
-            ['山西','阳泉','4','5'],
-            ['山西','晋中','4','5'],
-            ['山西','长治','4','5'],
-            ['山西','晋城','4','5'],
-            ['山西','临汾','5','6'],
-            ['山西','吕梁','4','5'],
-            ['山西','运城','4','5'],
-            ['河南','商丘','3','4'],
-            ['河南','郑州','4','5'],
-            ['河南','安阳','4','5'],
-            ['河南','新乡','4','5'],
-            ['河南','许昌','4','5'],
-            ['河南','平顶山','4','5'],
-            ['河南','信阳','3','4'],
-            ['河南','南阳','4','5'],
-            ['河南','开封','4','5'],
-            ['河南','洛阳','4','5'],
-            ['河南','焦作','4','5'],
-            ['河南','鹤壁','4','5'],
-            ['河南','濮阳','4','5'],
-            ['河南','周口','3','4'],
-            ['河南','漯河','4','5'],
-            ['河南','驻马店','4','5'],
-            ['河南','三门峡','4','5'],
-            ['辽宁','大连','4','5'],
-            ['辽宁','鞍山','5','6'],
-            ['辽宁','本溪','5','6'],
-            ['辽宁','丹东','5','6'],
-            ['辽宁','锦州','4','5'],
-            ['辽宁','营口','5','6'],
-            ['辽宁','阜新','6','7'],
-            ['辽宁','辽阳','4','5'],
-            ['辽宁','朝阳','5','6'],
-            ['辽宁','盘锦','5','6'],
-            ['辽宁','葫芦岛','4','5'],
-            ['吉林','长春','4','5'],
-            ['吉林','吉林','5','6'],
-            ['吉林','延吉','5','6'],
-            ['吉林','四平','5','6'],
-            ['吉林','通化','5','6'],
-            ['吉林','白城','5','6'],
-            ['吉林','辽源','5','6'],
-            ['吉林','松原','5','6'],
-            ['吉林','白山','5','6'],
-            ['黑龙江','哈尔滨','5','6'],
-            ['黑龙江','齐齐哈尔','5','6'],
-            ['黑龙江','牡丹江','5','6'],
-            ['黑龙江','佳木斯','5','6'],
-            ['黑龙江','绥化','5','6'],
-            ['黑龙江','黑河','6','7'],
-            ['黑龙江','大兴安岭','6','7'],
-            ['黑龙江','伊春','5','6'],
-            ['黑龙江','大庆','5','6'],
-            ['黑龙江','七台河','5','6'],
-            ['黑龙江','鸡西','6','7'],
-            ['黑龙江','鹤岗','6','7'],
-            ['黑龙江','双鸭山','6','7'],
-            ['内蒙古','呼伦贝尔','6','7'],
-            ['内蒙古','呼和浩特','5','6'],
-            ['内蒙古','包头','5','6'],
-            ['内蒙古','乌海','5','6'],
-            ['内蒙古','乌兰察布','5','6'],
-            ['内蒙古','通辽','5','6'],
-            ['内蒙古','赤峰','4','5'],
-            ['内蒙古','鄂尔多斯','5','6'],
-            ['内蒙古','巴彦淖尔','5','6'],
-            ['内蒙古','锡林浩特','5','6'],
-            ['内蒙古','乌兰浩特','5','6'],
-            ['内蒙古','阿拉善','4','5'],
-            ['江苏','无锡','2','3'],
-            ['江苏','镇江','2','3'],
-            ['江苏','苏州','2','3'],
-            ['江苏','南通','2','3'],
-            ['江苏','扬州','2','3'],
-            ['江苏','盐城','2','3'],
-            ['江苏','徐州','2','3'],
-            ['江苏','淮安','2','3'],
-            ['江苏','连云港','2','3'],
-            ['江苏','常州','2','3'],
-            ['江苏','泰州','2','3'],
-            ['江苏','宿迁','2','3'],
-            ['山东','菏泽','4','5'],
-            ['山东','济南','4','5'],
-            ['山东','青岛','3','4'],
-            ['山东','淄博','4','5'],
-            ['山东','德州','4','5'],
-            ['山东','烟台','4','5'],
-            ['山东','潍坊','4','5'],
-            ['山东','济宁','3','4'],
-            ['山东','泰安','3','4'],
-            ['山东','临沂','3','4'],
-            ['山东','滨州','4','5'],
-            ['山东','东营','4','5'],
-            ['安徽','滁州','3','4'],
-            ['安徽','合肥','3','4'],
-            ['安徽','蚌埠','3','4'],
-            ['安徽','芜湖','3','4'],
-            ['安徽','淮南','3','4'],
-            ['安徽','马鞍山','3','4'],
-            ['安徽','安庆','3','4'],
-            ['安徽','宿州','3','4'],
-            ['安徽','阜阳','3','4'],
-            ['安徽','黄山','3','4'],
-            ['安徽','淮北','3','4'],
-            ['安徽','铜陵','3','4'],
-            ['安徽','宣城','3','4'],
-            ['安徽','六安','3','4'],
-            ['安徽','池州','3','4'],
-            ['浙江','衢州','2','3'],
-            ['浙江','杭州','2','3'],
-            ['浙江','湖州','2','3'],
-            ['浙江','嘉兴','2','3'],
-            ['浙江','宁波','2','3'],
-            ['浙江','绍兴','2','3'],
-            ['浙江','台州','2','3'],
-            ['浙江','温州','2','3'],
-            ['浙江','丽水','2','3'],
-            ['浙江','金华','2','3'],
-            ['浙江','舟山','2','3'],
-            ['福建','福州','3','4'],
-            ['福建','厦门','4','5'],
-            ['福建','宁德','3','4'],
-            ['福建','莆田','4','5'],
-            ['福建','泉州','4','5'],
-            ['福建','漳州','4','5'],
-            ['福建','龙岩','4','5'],
-            ['福建','三明','4','5'],
-            ['福建','南平','3','4'],
-            ['山东','威海','4','5'],
-            ['山东','枣庄','3','4'],
-            ['山东','日照','3','4'],
-            ['山东','聊城','4','5'],
-            ['广东','汕尾','4','5'],
-            ['广东','阳江','4','5'],
-            ['广东','揭阳','4','5'],
-            ['广东','茂名','6','7'],
-            ['云南','景洪','5','6'],
-            ['云南','瑞丽','6','7'],
-            ['江西','鹰潭','3','4'],
-            ['湖北','襄阳','4','5'],
-            ['湖北','鄂州','3','4'],
-            ['湖北','孝感','4','5'],
-            ['湖北','黄冈','3','4'],
-            ['湖北','黄石','3','4'],
-            ['湖北','咸宁','4','5'],
-            ['湖北','荆州','4','5'],
-            ['湖北','宜昌','4','5'],
-            ['湖北','恩施','4','5'],
-            ['湖北','十堰','4','5'],
-            ['湖北','随州','4','5'],
-            ['湖北','荆门','4','5'],
-            ['湖北','仙桃','4','5'],
-            ['湖南','岳阳','4','5'],
-            ['湖南','长沙','4','5'],
-            ['湖南','湘潭','4','5'],
-            ['湖南','株洲','4','5'],
-            ['湖南','衡阳','4','5'],
-            ['湖南','郴州','4','5'],
-            ['湖南','常德','4','5'],
-            ['湖南','益阳','4','5'],
-            ['湖南','娄底','4','5'],
-            ['湖南','邵阳','4','5'],
-            ['湖南','吉首','4','5'],
-            ['湖南','张家界','4','5'],
-            ['湖南','怀化','4','5'],
-            ['湖南','永州','4','5'],
-            ['广东','江门','4','5'],
-            ['广东','韶关','4','5'],
-            ['广东','惠州','4','5'],
-            ['广东','梅州','5','6'],
-            ['广东','汕头/汕尾','4','5'],
-            ['广东','深圳','4','5'],
-            ['广东','珠海','4','5'],
-            ['广东','佛山','4','5'],
-            ['广东','肇庆','4','5'],
-            ['广东','湛江','5','6'],
-            ['广东','中山','4','5'],
-            ['广东','河源','4','5'],
-            ['广东','清远','4','5'],
-            ['广东','云浮','4','5'],
-            ['广东','潮州','4','5'],
-            ['广东','东莞','4','5'],
-            ['广西','防城港','5','6'],
-            ['广西','南宁','5','6'],
-            ['广西','来宾','5','6'],
-            ['广西','桂林','5','6'],
-            ['广西','贺州','5','6'],
-            ['广西','贵港','5','6'],
-            ['广西','百色','5','6'],
-            ['广西','钦州','5','6'],
-            ['广西','河池','4','5'],
-            ['广西','北海','5','6'],
-            ['江西','新余','4','5'],
-            ['江西','南昌','3','4'],
-            ['江西','九江','3','4'],
-            ['江西','上饶','3','4'],
-            ['江西','抚州','3','4'],
-            ['江西','宜春','4','5'],
-            ['江西','吉安','4','5'],
-            ['江西','赣州','4','5'],
-            ['江西','景德镇','3','4'],
-            ['江西','萍乡','4','5'],
-            ['四川','攀枝花','5','6'],
-            ['四川','自贡','5','6'],
-            ['四川','绵阳','5','6'],
-            ['四川','南充','5','6'],
-            ['四川','达州','4','5'],
-            ['四川','遂宁','5','6'],
-            ['四川','广安','5','6'],
-            ['四川','巴中','5','6'],
-            ['四川','泸州','5','6'],
-            ['四川','宜宾','5','6'],
-            ['四川','内江','5','6'],
-            ['四川','乐山','5','6'],
-            ['四川','西昌','5','6'],
-            ['四川','雅安','5','6'],
-            ['四川','康定','4','5'],
-            ['四川','阿坝藏族羌族州','5','6'],
-            ['四川','德阳','5','6'],
-            ['四川','广元','5','6'],
-            ['贵州','贵阳','4','5'],
-            ['贵州','都匀','4','5'],
-            ['贵州','凯里','4','5'],
-            ['贵州','铜仁','5','6'],
-            ['贵州','毕节','5','6'],
-            ['贵州','六盘水','5','6'],
-            ['贵州','兴义','5','6'],
-            ['云南','昭通','5','6'],
-            ['云南','昆明','5','6'],
-            ['云南','大理','5','6'],
-            ['云南','红河哈尼族彝族州','5','6'],
-            ['云南','曲靖','5','6'],
-            ['云南','保山','5','6'],
-            ['云南','文山','5','6'],
-            ['云南','玉溪','5','6'],
-            ['云南','楚雄','5','6'],
-            ['云南','普洱','5','6'],
-            ['云南','临沧','5','6'],
-            ['云南','香格里拉','5','6'],
-            ['海南','海口','5','6'],
-            ['新疆','乌苏','6','7'],
-            ['新疆','哈密','6','7'],
-            ['新疆','和田市','6','7'],
-            ['新疆','阿勒泰市','6','7'],
-            ['新疆','阿图什市','6','7'],
-            ['新疆','博尔塔拉蒙古州','6','7'],
-            ['陕西','延安','4','5'],
-            ['陕西','榆林','4','5'],
-            ['陕西','渭南','4','5'],
-            ['陕西','商洛','4','5'],
-            ['陕西','安康','4','5'],
-            ['陕西','汉中','4','5'],
-            ['陕西','宝鸡','4','5'],
-            ['陕西','铜川','4','5'],
-            ['甘肃','临夏','4','5'],
-            ['甘肃','兰州','5','6'],
-            ['甘肃','定西','5','6'],
-            ['甘肃','平凉','5','6'],
-            ['甘肃','庆阳','4','5'],
-            ['甘肃','武威','5','6'],
-            ['甘肃','张掖','5','6'],
-            ['甘肃','酒泉','5','6'],
-            ['甘肃','天水','4','5'],
-            ['甘肃','陇南','5','6'],
-            ['甘肃','合作','5','6'],
-            ['甘肃','白银','5','6'],
-            ['宁夏','银川','5','6'],
-            ['宁夏','石嘴山','5','6'],
-            ['宁夏','吴忠','5','6'],
-            ['宁夏','固原','5','6'],
-            ['宁夏','中卫','5','6'],
-            ['青海','海北藏族自治州','5','6'],
-            ['青海','西宁','5','6'],
-            ['青海','海东','5','6'],
-            ['青海','同仁县','5','6'],
-            ['青海','共和县','5','6'],
-            ['青海','玛訫县','5','6'],
-            ['青海','德令哈','5','6'],
-            ['青海','格尔木','5','6'],
-            ['新疆','克拉玛依','6','7'],
-            ['新疆','乌鲁木齐','6','7'],
-            ['新疆','奎屯','6','7'],
-            ['新疆','石河子','6','7'],
-            ['新疆','昌吉州','6','7'],
-            ['新疆','吐鲁番','6','7'],
-            ['新疆','库尔勒','6','7'],
-            ['新疆','阿克苏市','6','7'],
-            ['新疆','喀什市','6','7'],
-            ['新疆','伊犁哈萨克州','6','7']];
-    }
 }

app/Services/OrderIssueService.php

@@ -423,9 +423,9 @@ class OrderIssueService
 
                 $owner_id = $orderIssue['order']['owner_id'];
                 $rejectedBill = RejectedBill::query()->firstOrCreate([
-                        'id_logistic_return' => $arr['rejectedBill']['id_logistic_return'] ?? '',
-                        'id_owner' => $owner_id ?? '',
-                        'logistic_number_return' => $arr['rejectedBill']['logistic_number_return'],]
+                    'id_logistic_return' => $arr['rejectedBill']['id_logistic_return'] ?? '',
+                    'id_owner' => $owner_id ?? '',
+                    'logistic_number_return' => $arr['rejectedBill']['logistic_number_return'],]
                 );
                 $rejectedBill->save();
                 $rejectedBill->同步问题件();

app/Services/OrderTrackingService.php

@@ -324,7 +324,8 @@ class OrderTrackingService
                         'order_remark' => $params['order_remark'],
                         'web_order_number' => $params['web_order_number'],
                         'gross_weight'  => $gross_weight,
-                        'bulk' => $bulk
+                        'bulk' => $bulk,
+                        'planning_sent_at' => $params['web_order_number']??'planning_sent_at'
                     ];
                 }
             }
@@ -387,11 +388,11 @@ class OrderTrackingService
         if(preg_match('/^O[\d]/',$orderHeader['soreference1'] ?? '') > 0){
             $web_order_number = $orderHeader['soreference1'];
         }
-        $pick_up_at = $orderHeader->lastshipmenttime ?? null;
-        if(isset($pick_up_at)){
+        $planning_sent_at = $orderHeader->lastshipmenttime ?? null;
+        if(isset($planning_sent_at)){
              $logisticTiming = app(LogisticTimingService::class)->findByParams($orderHeader['c_city']??'',$orderHeader['c_province']??'',$order->logistic_id);
              if($logisticTiming){
-                 $pick_up_at = Carbon::create($pick_up_at)->addDays($logisticTiming->days_at_working);
+                 $planning_sent_at = Carbon::create($planning_sent_at)->addDays($logisticTiming->days_at_working);
              }
         }
         return [
@@ -399,8 +400,9 @@ class OrderTrackingService
             'client' => $client,
             'created_at' => $order->created_at,
             'order_remark' => $order_remark,
-            'pick_up_at' => $pick_up_at, // 提货时间
-            'web_order_number' =>$web_order_number
+            'pick_up_at' => $orderHeader->lastshipmenttime, // 提货时间
+            'web_order_number' =>$web_order_number,
+            'planning_sent_at' => $planning_sent_at
         ];
     }