Merge branch 'yang-logistic-fix' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	resources/views/package/menu.blade.php

app/Filters/OrderPackageFilters.php

@@ -13,7 +13,7 @@ class OrderPackageFilters
     protected $request;
     protected $queryBuilder;
     protected $filters = ['logistic_number', 'status', 'received_at_start',
-        'received_at_end', 'is_weighed', 'logistic_id', 'owner_id', 'sent_at_start', 'sent_at_end', 'is_exception'];
+        'received_at_end', 'is_weighed', 'logistic_id', 'owner_id', 'sent_at_start', 'sent_at_end', 'is_exception','default_date'];
 
     public function __construct(Request $request)
     {
@@ -90,4 +90,9 @@ class OrderPackageFilters
     {
         $this->queryBuilder->where('exception', $is_exception);
     }
+
+    public function default_date()
+    {
+        $this->queryBuilder->where('created_at', '>=',now()->startOfDay() ->subDays(15))->where('created_at', '<',now()->startOfDay()->addDay());
+    }
 }

app/Http/Controllers/SendEmailsController.php

@@ -8,7 +8,17 @@ use Illuminate\Http\Request;
 
 class SendEmailsController extends Controller
 {
+
+
     //
+    /**
+     * SendEmailsController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware('auth')->except([]);
+    }
+
     public function index()
     {
         $roles = Role::all();

app/Services/OrderPackageReceivedSyncService.php

@@ -84,7 +84,7 @@ class OrderPackageReceivedSyncService
             if (isset($data['status'])) $orderPackage->status = $data['status'];
             if (isset($data['received_at'])) $orderPackage->received_at = $data['received_at'];
             if (isset($data['exception'])) $orderPackage->exception = $data['exception'];
-            if (isset($data['transfer_status'])) $orderPackage->transfer_status = json_encode($data['transfer_status'],JSON_UNESCAPED_UNICODE);
+            if (isset($data['transfer_status'])) $orderPackage->transfer_status = $data['transfer_status'];
             $orderPackage->save();
         }
     }
@@ -102,13 +102,14 @@ class OrderPackageReceivedSyncService
                 return $query->with('logistic');
             }]);
         if (Carbon::now()->lte($initDate)) {//当前时间小于等于初始化时间
-            $query = $query->where('created_at', '>=', $initDate->subMonths(1)->toDateTimeString()); //初始化查询一个月的数据
-        } else {//当前时间大于初始化时间
-            $query = $query->where('created_at', '>=', $initDate->toDateTimeString()); //大于等于初始化时间的全部快递单号
+            //初始化查询一个月的数据，exception为否
+            $query = $query->where('created_at', '>=', $initDate->subMonths(1)->toDateTimeString())
+                ->where('exception', '否');
+        } else {//当前时间大于初始化时间，exception为否且未收货
+            $query = $query->where('created_at', '>=', $initDate->toDateTimeString())
+                ->where('exception', '否')
+                ->whereNull('received_at');
         }
-        $query = $query
-            ->where('exception', '否')
-            ->whereNull('received_at');
         return $this->buildData($query->get(), $data);
     }
 

database/migrations/2021_01_08_112003_add_default_mail_event_role.php

@@ -1,36 +0,0 @@
-<?php
-
-use App\Events\SendEmailEvent;
-use App\MailEvent;
-use App\Role;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-class AddDefaultMailEventRole extends Migration
-{
-    protected $role;
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $this->role =  Role::query()->firstOrCreate(['name'=>'发送邮件测试']);
-        $emailEvent = MailEvent::query()->where('name', '发送默认邮件')->first();
-        $emailEvent->roles()->attach($this->role->id);
-        $this->role->users()->attach(\App\User::query()->where('name','yang')->first()->id);
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        $this->role->delete();
-    }
-}

database/migrations/2021_01_21_100909_add_created_at_index_order_packages.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCreatedAtIndexOrderPackages extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('order_packages', function (Blueprint $table) {
+            //
+            $table->index('created_at');
+            $table->index(['status','created_at']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('order_packages', function (Blueprint $table) {
+            //
+            $table->dropIndex('order_packages_created_at_index');
+            $table->dropIndex('order_packages_status_created_at_index');
+        });
+    }
+}

database/migrations/2021_01_21_132441_add_authorrities_mail.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAuthorritiesMail extends Migration
+{
+    protected $authNames=[
+        "基础设置-邮件",
+    ];
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        foreach ($this->authNames as $name){
+            \App\Authority::create(['name'=>$name,'alias_name'=>$name,'permission'=>'允许']);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        foreach ($this->authNames as $name){
+            \App\Authority::where(['name'=>$name,'alias_name'=>$name])->delete();
+        }
+    }
+}

resources/views/maintenance/menu.blade.php

@@ -98,10 +98,11 @@
                 <li class="nav-item">
                     <a class="nav-link text-muted" href="{{url('maintenance/laborCompany')}}" :class="{active:isActive('laborCompany',2)}">劳务所</a>
                 </li> @endcan
-            {{--TODO 权限--}}
+            @can('基础设置-邮件')
                 <li class="nav-item">
                     <a class="nav-link text-muted" href="{{url('maintenance/mail')}}" :class="{active:isActive('mail',2)}">邮件</a>
                 </li>
+                @endcan
             @can('日志')
                 <li class="nav-item">
                     <a class="nav-link text-muted" href="{{url('maintenance/log')}}" :class="{active:isActive('log',2)}">日志</a>

resources/views/package/logistic/index.blade.php

@@ -132,6 +132,7 @@
                             placeholder: '是否称重',
                             data: [{name: false, value: '无'}, {name: true, value: '已称重'}]
                         },
+                        {name: 'default_date', type: 'checkbox', tip: '默认15天', data: [{name: 'ture', value: '默认15天'}]},
 
                     ], [
                         {

resources/views/package/menu.blade.php

@@ -6,10 +6,9 @@
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('package/weigh/index')}}" :class="{active:isActive('weigh',2)}">称重管理</a>
                 </li>@endcan
-                {{--TODO 权限修改--}}
-            @can('称重管理-快递')
+                @can('称重管理-查询')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('package/logistic')}}" :class="{active:isActive('logistic',2)}">快递</a>
+                    <a class="nav-link" href="{{url('package/logistic?default_date=ture&logistic_id=&owner_id=')}}" :class="{active:isActive('logistic',2)}">快递</a>
                 </li>@endcan
             @can('称重管理-查看异常')
             <li class="nav-item">