Merge branch 'master' of ssh://47.103.131.176:10022/var/git/bswas

app/Filters/OrderPackageFilters.php

@@ -38,6 +38,9 @@ class OrderPackageFilters
         'issue_type_name',
         'order_notes',//订单备注
         'exception_status',//订单备注
+        'is_customer_service_remark',//是否有客服备注
+        'customer_service_remark_created_at_start',//客服备注起始时间
+        'customer_service_remark_created_at_end',//客服备注截止时间
     ];
 
     protected $orderIssueQuery;
@@ -82,7 +85,7 @@ class OrderPackageFilters
     private function has_transfer_status($has_transfer_status)
     {
         if ($has_transfer_status == '是') {
-            $this->queryBuilder->whereNotNull('transfer_status')->where('transfer_status','!=',[]);
+            $this->queryBuilder->whereNotNull('transfer_status')->where('transfer_status', '!=', []);
         } elseif ($has_transfer_status == '否') {
             $this->queryBuilder->where(function ($query) {
                 $query->whereNull('transfer_status')->orwhere('transfer_status', []);
@@ -221,4 +224,28 @@ class OrderPackageFilters
         $arr = array_filter(preg_split('/[,， ]+/is', $exception_status));
         $this->queryBuilder->whereIn('exception_status', $arr);
     }
+
+    public function is_customer_service_remark($is_customer_service_remark)
+    {
+        if ($is_customer_service_remark === '是') {
+            $this->queryBuilder->has('orderPackageRemarks');
+        } else if ($is_customer_service_remark === '否') {
+            $this->queryBuilder->doesntHave('orderPackageRemarks');
+        }
+    }
+
+    public function customer_service_remark_created_at_start($customer_service_remark_created_at_start)
+    {
+        $this->queryBuilder->whereIn('id', function ($query) use ($customer_service_remark_created_at_start) {
+            return $query->from('order_package_remarks')->select('order_package_id')->where('created_at', '>=', $customer_service_remark_created_at_start);
+        });
+    }
+
+
+    public function customer_service_remark_created_at_end($customer_service_remark_created_at_end)
+    {
+        $this->queryBuilder->whereIn('id', function ($query) use ($customer_service_remark_created_at_end) {
+            return $query->from('order_package_remarks')->select('order_package_id')->where('created_at', '<=', $customer_service_remark_created_at_end);
+        });
+    }
 }

app/OrderPackage.php

@@ -59,6 +59,7 @@ class OrderPackage extends Model
     protected $dates = [
         'sent_at',
         'received_at',
+        'weighed_at',
     ];
 
     static public $enums = [

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

@@ -367,8 +367,18 @@
                             data: [{name: false, value: '无'}, {name: true, value: '已称重'}]
                         },
                         {name: 'received_at_start', type: 'dateTime', tip: '选择显示收货时间的起始时间'},
-                        {name: 'default_date', type: 'checkbox', tip: '默认15天', data: [{name: 'ture', value: '默认15天'}]},
-                        {name: 'default_logistics', type: 'checkbox', tip: '默认承运商', data: [{name: 'ture', value: '默认承运商'}]},
+                        {
+                            name: 'is_customer_service_remark',
+                            type: 'select',
+                            tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的状态'],
+                            placeholder: ['客服备注'],
+                            data: [
+                                {name: '是', value: '是'},
+                                {name: '否', value: '否'},
+                            ]
+                        },
+                        {name: 'customer_service_remark_created_at_start', type: 'dateTime', tip: '选择显示客服备注时间的起始时间'},
+
                     ],
                     [
                         {
@@ -416,6 +426,8 @@
                             placeholder: '退件状态',
                             data: [{name: '无', value: '无'}, {name: '有', value: '有'}]
                         },
+                        {name: 'customer_service_remark_created_at_end', type: 'dateTime', tip: '选择显示客服备注时间的起始时间'},
+
                     ],
                     [
                         {
@@ -459,6 +471,9 @@
                                 {name: '7', value: '派送异常'},
                             ]
                         },
+                        {name: 'default_date', type: 'checkbox', tip: '默认15天', data: [{name: 'ture', value: '默认15天'}]},
+                        {name: 'default_logistics', type: 'checkbox', tip: '默认承运商', data: [{name: 'ture', value: '默认承运商'}]},
+
 
                     ]
                 ];