Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/api/thirdPart/flux/SortingController.php

app/Components/SyncResponse.php

@@ -1,15 +0,0 @@
-<?php
-namespace App\Components;
-
-use Illuminate\Support\Facades\Gate;
-
-trait SyncResponse{
-
-    protected function gate(string $authorityName)
-    {
-        if(!Gate::allows($authorityName)){
-            echo view('exception.authority');
-            exit();
-        }
-    }
-}

app/Http/Controllers/RegionController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Components\AsyncResponse;
 use App\Region;
+use Illuminate\Support\Facades\Gate;
 
 class RegionController extends Controller
 {
@@ -18,6 +19,7 @@ class RegionController extends Controller
 
     public function index()
     {
+        if(!Gate::allows("地域"))return view("exception.authority");
         $regions = Region::withTrashed()->get();
         return view("maintenance.region.index",compact("regions"));
     }

app/Http/Controllers/TestController.php

@@ -51,6 +51,8 @@ use App\Package;
 use App\Process;
 use App\ProcessDaily;
 use App\ProcessStatistic;
+use App\Province;
+use App\Region;
 use App\RejectedBill;
 use App\RejectedBillItem;
 use App\Services\CacheService;
@@ -171,8 +173,57 @@ sql;
 
     public function zzd()
     {
-        return app("RegionService")->getCity("哈达克力扣州");
-
+         $province = [
+             "a"=>["安徽","澳门"],
+             "b"=>["北京"],
+             "c"=>["重庆"],
+             "f"=>["福建"],
+             "g"=>["广东","甘肃","广西","贵州"],
+             "h"=>["河北","湖北","黑龙江","湖南","河南","海南"],
+             "j"=>["吉林","江苏","江西"],
+             "l"=>["辽宁"],
+             "n"=>["内蒙古","宁夏"],
+             "q"=>["青海"],
+             "s"=>["四川","山东","上海","陕西","山西"],
+             "t"=>["天津","台湾"],
+             "x"=>["香港","新疆","西藏"],
+             "y"=>["云南"],
+             "z"=>["浙江"],
+         ];
+         foreach ($province as $arr){
+             foreach ($arr as $name){
+                 Region::query()->create([
+                     "name" => $name,
+                     "type" => 1,
+                 ]);
+             }
+         }
+    }
+
+    public function sync()
+    {
+        foreach (Batch::query()->with("orders")->where("created_at",">","2021-01-20 15:00:00")->get() as $batch){
+            $order = [];
+            $map = [];
+            foreach ($batch->orders as $o){
+                $order[] = $o->code;
+                $map[$o->code] = $o->id;
+            }
+            $sql = <<<sql
+SELECT ORDERNO,WAVENO,SEQNO,EDITTIME FROM DOC_WAVE_DETAILS WHERE WAVENO = ? AND ORDERNO IN ('' 
+sql;
+            foreach($order as $o){
+                $sql .= ",'".$o."'";
+            }
+            $sql .= ")";
+            $re = DB::connection("oracle")->select(DB::raw($sql),[$batch->code]);
+            foreach ($re as $r){
+               OrderBin::query()->firstOrCreate([
+                    'order_id' => $map[$r->orderno],
+                    'number' => $r->seqno,
+                ]);
+            }
+        }
     }
 
     public function mergeCarrier()

resources/views/maintenance/menu.blade.php

@@ -54,6 +54,10 @@
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('maintenance/city')}}" :class="{active:isActive('city',2)}">城市</a>
                 </li> @endcan
+            @can('地域')
+                <li class="nav-item">
+                    <a class="nav-link text-dark" href="{{url('maintenance/region')}}" :class="{active:isActive('region',2)}">地域</a>
+                </li> @endcan
             @can('承运商')
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">承运商</a>

resources/views/maintenance/region/index.blade.php

@@ -0,0 +1,70 @@
+@extends('layouts.app')
+@section('title')设置@endsection
+
+@section('content')
+    @component('maintenance.menu')@endcomponent
+    <div class="container-fluid" id="container">
+        <div class="card">
+            <div class="card-body mt-2">
+                <div class="row">
+                    <div class="col-5 offset-4">
+                        <div class="row m-0 font-weight-bold">
+                            <label class="offset-1 col-4">省份</label>
+                            <label class="col-4">邮编</label>
+                            <label class="col-3">状态</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row" v-for="region in parentMapping[0]">
+                    <div class="col-5 offset-4">
+                        <div class="row m-0">
+                            <span class="fa fa-angle-double-right col-1 cursor-pointer"></span>
+                            <label class="col-4">@{{ region.name }}</label>
+                            <label class="col-4">@{{ region.code }}</label>
+                            <label class="col-3">
+                                <span class="fa fa-circle" :class="region.deleted_at ? 'text-danger' : 'text-success'"></span>
+                                <span v-if="region.deleted_at">冻结</span><span v-else>正常</span>
+                            </label>
+                        </div>
+                    </div>
+                    <div class="col-5 offset-5">
+                        <div class="row m-0">
+                            <span class="fa fa-angle-double-right col-1 cursor-pointer"></span>
+                            <label class="col-4">@{{ region.name }}</label>
+                            <label class="col-4">@{{ region.code }}</label>
+                            <label class="col-3">
+                                <span class="fa fa-circle" :class="region.deleted_at ? 'text-danger' : 'text-success'"></span>
+                                <span v-if="region.deleted_at">冻结</span><span v-else>正常</span>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section("lastScript")
+    <script>
+        new Vue({
+            el:"#container",
+            data:{
+                regions:[
+                    @foreach($regions as $region)
+                    {!! $region !!},
+                    @endforeach
+                ],
+                parentMapping:{},
+            },
+            mounted(){
+                let parent = {};
+                this.regions.forEach(region=>{
+                    let p = region.parent_id ? region.parent_id : 0;
+                    if (parent[p])parent[p].push(region);
+                    else parent[p] = [region];
+                });
+                this.parentMapping = parent;
+            },
+        });
+    </script>
+@stop

routes/web.php

@@ -198,6 +198,7 @@ Route::group(['prefix'=>'maintenance'],function(){
     });
 
     Route::get('syncRedisLogs','LogController@syncRedisLogs');
+    Route::get('region', 'RegionController@index');
     Route::resource('log', 'LogController');
     Route::resource('user', 'UserController');
     Route::resource('role', 'RoleController');

tests/webApi/thirdPart/haochuang/process.http

@@ -1,4 +1,6 @@
 POST http://bswas/api/thirdPart/haochuang/sorting/process
 Content-Type: application/json
 
-{"batch_id":"W201023000096k","station_id":"ffffffff-c7f2-adf0-c7f2-adf000000000","token":"bf803b6eeffcfc61396f1accb8487e27"}
+{"batch_id":"W210120000183","station_id":"ffffffff-c7f2-adf0-c7f2-adf000000000","token":"bf803b6eeffcfc61396f1accb8487e27"}
+
+###