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

调整核销列表

Browse Source
This commit is contained in:
徐永宾
2021-03-22 17:02:06 +08:00
parent 6346b4aa33
commit ad28b6ab1e
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Admin/Controllers/Coupon/IndexController.php
View File

@@ -78,6 +78,7 @@ class IndexController extends AdminController
$grid->column('couponName', '优惠政策');
$grid->column('price', '核销金额');
$grid->column('total', '订单金额');
$grid->column('orderid', '订单id');
$grid->column('资金通道结算')->display(function () {
$profit = $this->status == 2 ? $this->profit : '0.00';
@@ -100,8 +101,8 @@ class IndexController extends AdminController
$grid->column('remark', '处理结果');
$grid->column('startTime', '起始时间');
$grid->column('endTime', '到期时间');
$grid->column('created_at', '核销时间');
$grid->column('endTime', '到期时间')->hide();
$grid->column('created_at', '核销时间')->hide();
$grid->column('省')->display(function () {
return ($this->outlet && $this->outlet->province) ? $this->outlet->province->name : '';
});
@@ -142,14 +143,14 @@ class IndexController extends AdminController
$export->column('redemptionCode', function ($value, $original) {
return $value . "\t";
});
// $export->column('price', function ($value, $original) {
// return $value . "\t";
// });
// $export->column('total', function ($value, $original) {
// return $value . "\t";
// });
$export->column('price', function ($value, $original) {
return $value . "\t";
});
$export->column('total', function ($value, $original) {
return $value . "\t";
});
$export->column('资金通道结算', function ($value, $original) {
return strip_tags($value);
return strip_tags($value) . "\t";
});
$export->filename('卡券列表' . date("YmdHis"));
});