xuanchen/pingan_unionpay_new
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

渠道后台增加平安主订单id

Browse Source
This commit is contained in:
徐永宾
2022-01-24 15:57:15 +08:00
parent 3c532e312e
commit 8ffcd52c23
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Merchant/Controllers/Coupon/IndexController.php
View File

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