From 8ffcd52c231d7a31c81dde102c173738368d9ccf Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Mon, 24 Jan 2022 15:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=A0=E9=81=93=E5=90=8E=E5=8F=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B9=B3=E5=AE=89=E4=B8=BB=E8=AE=A2=E5=8D=95id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Merchant/Controllers/Coupon/IndexController.php | 9 ++++++++-
 app/Merchant/Resources/views/coupon/index.blade.php | 9 +++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Merchant/Controllers/Coupon/IndexController.php b/app/Merchant/Controllers/Coupon/IndexController.php
index 4f0a4bf..24e2fbd 100644
--- a/app/Merchant/Controllers/Coupon/IndexController.php
+++ b/app/Merchant/Controllers/Coupon/IndexController.php
@@ -33,6 +33,7 @@ class IndexController extends Controller
             $start             = $request->start;
             $end               = $request->end;
             $thirdPartyGoodsId = $request->thirdPartyGoodsId;
+            $pa_order_id       = $request->pa_order_id;
 
             $coupons = Coupon::where('user_id', $user->id)
                 ->when($outlet, function ($q) use ($outlet) {
@@ -48,6 +49,9 @@ class IndexController extends Controller
                 ->when($thirdPartyGoodsId, function ($q) use ($thirdPartyGoodsId) {
                     $q->where('thirdPartyGoodsId', $thirdPartyGoodsId);
                 })
+                ->when($pa_order_id, function ($q) use ($pa_order_id) {
+                    $q->where('pa_order_id', $pa_order_id);
+                })
                 ->when(is_numeric($status), function ($query) use ($status) {
                     if ($status == 4) {
                         $query->where('is_profit', 1);
@@ -154,6 +158,9 @@ class IndexController extends Controller
                     ->when($request->thirdPartyGoodsId, function ($q) use ($request) {
                         $q->where('thirdPartyGoodsId', $request->thirdPartyGoodsId);
                     })
+                    ->when($request->pa_order_id, function ($q) use ($request) {
+                        $q->where('pa_order_id', $request->pa_order_id);
+                    })
                     ->when(is_numeric($request->status), function ($query) use ($request) {
                         $query->where('status', $request->status);
                     }, function ($query) {
@@ -249,7 +256,7 @@ class IndexController extends Controller
         $filename = '卡券记录'.date('YmdHis').'.csv';
         $response = function () use ($user, $request) {
             $handle = fopen('php://output', 'w');
-            $titles = ['ID', '网点名称', '平安券编号', '优惠政策', '核销金额', '订单id', '状态', '处理结果', '核销时间'];
+            $titles = ['ID', '网点名称', '平安券编号', '优惠政策', '核销金额', '平安主订单号', '状态', '处理结果', '核销时间'];
             fputcsv($handle, $titles);
 
             Coupon::where('user_id', $user->id)
diff --git a/app/Merchant/Resources/views/coupon/index.blade.php b/app/Merchant/Resources/views/coupon/index.blade.php
index 74751f0..8ee31bb 100644
--- a/app/Merchant/Resources/views/coupon/index.blade.php
+++ b/app/Merchant/Resources/views/coupon/index.blade.php
@@ -44,6 +44,10 @@
                                 <input type="text" placeholder="平安券编号" name="redemptionCode"
                                        class="input-sm form-control" value="{{ Request::input('redemptionCode') }}">
                             </div>
+                            <div class="form-group">
+                                <input type="text" placeholder="平安主订单号" name="pa_order_id"
+                                       class="input-sm form-control" value="{{ Request::input('pa_order_id') }}">
+                            </div>
 
                             <div class="form-group">
                                 <select class="form-control m-b" name="status">
@@ -105,7 +109,7 @@
                         <th>平安券编号</th>
                         <th>优惠政策</th>
                         <th>核销金额</th>
-                        <th>订单id</th>
+                        <th>平安主订单号</th>
                         <th>状态</th>
                         <th>处理结果</th>
                         <th>核销时间</th>
@@ -121,7 +125,8 @@
                             <td>{{ $coupon->redemptionCode }}</td>
                             <td>{{ $coupon->couponName }}</td>
                             <td>{{ $coupon->price }}</td>
-                            <td>{{ $coupon->orderid }}</td>
+                            {{--                            <td>{{ $coupon->orderid }}</td>--}}
+                            <td>{{ $coupon->pa_order_id }}</td>
                             <td>{{ $coupon->status_text }}</td>
                             <td>{{ $coupon->remark }}</td>
                             <td>{{ $coupon->created_at }}</td>