调整核销列表

app/Merchant/Controllers/Coupon/IndexController.php

@@ -88,7 +88,7 @@ class IndexController extends Controller
     /**
      * 按照日期分润
      * @author 玄尘 2020-03-11
-     * @param Request $request [description]
+     * @param  Request  $request  [description]
      * @return array|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function profits(Request $request)
@@ -119,7 +119,7 @@ class IndexController extends Controller
     /**
      * 分润
      * @author 玄尘 2020-03-11
-     * @param Coupon $coupon [description]
+     * @param  Coupon  $coupon  [description]
      * @return [type]         [description]
      */
     public function profit(Coupon $coupon)
@@ -249,7 +249,7 @@ class IndexController extends Controller
         $filename = '卡券记录' . date('YmdHis') . '.csv';
         $response = function () use ($user, $request) {
             $handle = fopen('php://output', 'w');
-            $titles = ['ID', '网点名称', '平安券编号', '优惠政策', '核销金额', '状态', '处理结果', '核销时间'];
+            $titles = ['ID', '网点名称', '平安券编号', '优惠政策', '核销金额', '订单id', '状态', '处理结果', '核销时间'];
             fputcsv($handle, $titles);
 
             Coupon::where('user_id', $user->id)
@@ -286,9 +286,10 @@ class IndexController extends Controller
                           fputcsv($handle, [
                               $info->id,
                               $info->outlet ? $info->outlet->nickname : 'Id:' . $info->outletId,
-                              $info->redemptionCode . "\t",
+                              $info->redemptionCode,
                               ' ' . $info->couponName,
-                              $info->price,
+                              $info->price . "\t",
+                              $info->orderid,
                               $info->status_text,
                               $info->remark,
                               $info->created_at,