From 665d56a8bba3e4350d2547de3b3a4bf6be3f3cae Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 20 Nov 2020 10:42:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=BB=9F=E8=AE=A1--?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php | 2 +-
 app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php b/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php
index fb3a06a..487f37f 100644
--- a/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php
+++ b/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php
@@ -32,7 +32,7 @@ class OrderDeliveryDetailSheet implements FromArray, WithStrictNullComparison, S
                     '订单编号',
                     '下单市场',
                     '下单时间',
-                    '订单配送费',
+                    '订单配送费（元）',
                 ]];
         $data = $this->getData($this->params);
         $markets = MarketModel::getMarketArray();
diff --git a/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php b/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php
index 27b6367..e06352b 100644
--- a/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php
+++ b/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php
@@ -46,7 +46,7 @@ class OrderDeliveryTotalSheet implements FromArray, WithStrictNullComparison, Sh
     {
         $titles = [[
                     '配送人员',
-                    '总配送费',
+                    '总配送费（元）',
                 ]];
         $data = $this->getData($this->params);
         return array_merge($titles,$data);
@@ -54,7 +54,11 @@ class OrderDeliveryTotalSheet implements FromArray, WithStrictNullComparison, Sh
 
     public function styles(Worksheet $sheet)
     {
-        $sheet->mergeCells('A1:B1');
+        $sheet->mergeCells('A1:B1');// 合并
+        // $sheet->getColumnDimension('A')->setWidth(100); // 列宽 不生效
+        $sheet->getRowDimension(1)->setRowHeight(20); // 行高
+        $sheet->getStyle('A1:B1')->getAlignment()->setVertical('center');// 垂直居中
+        $sheet->getStyle('A1:B1')->getAlignment()->setHorizontal('center');// 水平居中
 
         return [
             1 => ['font' => ['bold' => true,'size' => 12]],

From e00d699e8fdab927ca569d9b79d0ca19139f26e9 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 20 Nov 2020 10:50:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=BB=9F=E8=AE=A1--?=
 =?UTF-8?q?=E5=8F=AA=E7=BB=9F=E8=AE=A12020-10-01=E5=90=8E=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B9=8B=E5=89=8D=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E4=BF=9D=E5=AD=98=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E5=91=98=E7=9A=84=E8=81=8C=E5=B7=A5ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Repositories/v3/OrderDeliveryReport.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Repositories/v3/OrderDeliveryReport.php b/app/Admin/Repositories/v3/OrderDeliveryReport.php
index 7bd77f0..cd4f6e8 100644
--- a/app/Admin/Repositories/v3/OrderDeliveryReport.php
+++ b/app/Admin/Repositories/v3/OrderDeliveryReport.php
@@ -63,7 +63,8 @@ class OrderDeliveryReport extends EloquentRepository
             ->join(EmployeesModel::TABLE_NAME,EmployeesModel::TABLE_NAME.'.id','=',Model::$tableName.'.horseman_id','left')   
             ->where(Model::$tableName.'.type',1)
             ->where('shipping_type',1)
-            ->whereIn('state',Model::ORDER_STATE_FINISH);
+            ->whereIn('state',Model::ORDER_STATE_FINISH)
+            ->where(Model::$tableName.'.created_at','>=',strtotime('2020-10-01 00:00:00'));
 
         if($userId){
             $model->where(EmployeesModel::TABLE_NAME.'.user_id',$userId);