优化渠道导出

app/Admin/Controllers/Coupon/IndexController.php

@@ -145,14 +145,14 @@ class IndexController extends AdminController
             $export->column('redemptionCode', function ($value, $original) {
                 return $value . "\t";
             });
-            $export->column('price', function ($value, $original) {
+//            $export->column('price', function ($value, $original) {
-                return $value . "\t";
+            //                return $value . "\t";
-            });
+            //            });
             $export->column('total', function ($value, $original) {
                 return $value . "\t";
             });
             $export->column('资金通道结算', function ($value, $original) {
-                return strip_tags($value) . "\t";
+                return strip_tags($value);
             });
             $export->filename('卡券列表' . date("YmdHis"));
         });

app/Admin/routes.php

@@ -24,19 +24,10 @@ Route::group([
      */
     $router->get('user/parent', 'User\IndexController@getParent');
     $router->resource('users', 'User\IndexController');
-    //商品管理
+
-    $router->resource('goods', 'GoodsController');
     //身份管理
     $router->resource('identity', 'IdentityController');
 
-    $router->get('orders', 'Order\IndexController@index');
-
-    $router->get('payments', 'Payment\IndexController@index');
-
-    //用户提现管理
-    $router->get('cashout/logs', 'CashOutController@logs')->name('admin.cashout.logs');
-    $router->resource('cashout', 'CashOutController');
-
     /**
      * api 日志
      */

app/Http/Controllers/TestController.php

@@ -15,7 +15,8 @@ class TestController
 {
 
     use ApiResponse;
-    public $baseUrl = 'http://pac.ysd-bs.com/api/V1/';
+
+    public $baseUrl = 'http://pa.ysd-bs.com/api/V1/';
 
     public function index(Request $request)
     {

app/Merchant/Exporters/CouponExport.php

@@ -10,14 +10,21 @@ use Maatwebsite\Excel\Concerns\WithMapping;
 
 class CouponExport implements FromQuery, WithMapping, WithHeadings
 {
+
     use Exportable;
 
     public $outlet            = '';
+
     public $status            = '';
+
     public $redemptionCode    = '';
+
     public $start             = '';
+
     public $end               = '';
+
     public $user              = '';
+
     public $thirdPartyGoodsId = '';
 
     public function __construct($serchDatas, $user)
@@ -27,9 +34,16 @@ class CouponExport implements FromQuery, WithMapping, WithHeadings
 
         if (!empty($serchDatas)) {
             foreach ($serchDatas as $key => $data) {
+                if ($key == 'start') {
+                    $data = $data . ' 00:00:01';
+                }
+                if ($key == 'end') {
+                    $data = $data . ' 23:59:59';
+                }
                 if ($data) {
                     $this->$key = $data;
                 }
+
             }
         }
     }