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 @@ +