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

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

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

29
app/Merchant/Resources/views/coupon/index.blade.php
View File

@@ -7,7 +7,8 @@
@endsection @endsection
@push('script') @push('script')
<script type="text/javascript" src="{{ asset('assets/merchant/js/plugins/datapicker/bootstrap-datepicker.js') }}"></script> <script type="text/javascript"
src="{{ asset('assets/merchant/js/plugins/datapicker/bootstrap-datepicker.js') }}"></script>
<script type="text/javascript"> <script type="text/javascript">
$("#time-interval .input-daterange").datepicker({ $("#time-interval .input-daterange").datepicker({
keyboardNavigation: !1, keyboardNavigation: !1,
@@ -31,14 +32,17 @@
<div class="ibox-content"> <div class="ibox-content">
<div class="row"> <div class="row">
<div class="col-sm-12 m-b"> <div class="col-sm-12 m-b">
<form action="{{ route('merchant.coupons')}}" class="form-inline pull-right" method="get" accept-charset="utf-8"> <form action="{{ route('merchant.coupons')}}" class="form-inline pull-right" method="get"
accept-charset="utf-8">
<div class="input-group"> <div class="input-group">
<div class="form-group"> <div class="form-group">
<input type="text" placeholder="网点名称" name="outlet" class="input-sm form-control" value="{{ Request::input('outlet') }}"> <input type="text" placeholder="网点名称" name="outlet" class="input-sm form-control"
value="{{ Request::input('outlet') }}">
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="text" placeholder="平安券编号" name="redemptionCode" class="input-sm form-control" value="{{ Request::input('redemptionCode') }}"> <input type="text" placeholder="平安券编号" name="redemptionCode"
class="input-sm form-control" value="{{ Request::input('redemptionCode') }}">
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -53,7 +57,8 @@
<select class="form-control m-b" name="thirdPartyGoodsId"> <select class="form-control m-b" name="thirdPartyGoodsId">
<option value="">政策</option> <option value="">政策</option>
@foreach ($rules as $rule) @foreach ($rules as $rule)
<option value="{{ $rule->code }}" @if(request()->thirdPartyGoodsId== $rule->code) selected="" @endif > <option value="{{ $rule->code }}"
@if(request()->thirdPartyGoodsId== $rule->code) selected="" @endif >
{{ $rule->title }} {{ $rule->title }}
</option> </option>
@endforeach @endforeach
@@ -62,16 +67,20 @@
<div class="form-group" id="time-interval"> <div class="form-group" id="time-interval">
<div class="input-daterange input-group"> <div class="input-daterange input-group">
<input type="text" class="input-sm form-control" placeholder="核销时间" readonly name="start" value="{{ Request::input('start') }}"/> <input type="text" class="input-sm form-control" placeholder="核销时间" readonly
name="start" value="{{ Request::input('start') }}"/>
<span class="input-group-addon">~</span> <span class="input-group-addon">~</span>
<input type="text" class="input-sm form-control" placeholder="核销时间" readonly name="end" value="{{ Request::input('end') }}"/> <input type="text" class="input-sm form-control" placeholder="核销时间" readonly
name="end" value="{{ Request::input('end') }}"/>
</div> </div>
</div> </div>
<span class="input-group-btn"> <span class="input-group-btn">
<input type="hidden" name="action" value="search"> <input type="hidden" name="action" value="search">
<button type="button" class="btn btn-sm btn-primary" data-action="search"><i class="fa fa-check"></i>&nbsp;搜索</button> <button type="button" class="btn btn-sm btn-primary" data-action="search"><i
<button type="button" class="btn btn-sm btn-warning confirm" tip='确认要导出当前条件内容？' data-action="excel"><i class="fa fa-paste"></i>&nbsp;导出</button> class="fa fa-check"></i>&nbsp;搜索</button>
<button type="button" class="btn btn-sm btn-warning confirm" tip='确认要导出当前条件内容？'
data-action="excel"><i class="fa fa-paste"></i>&nbsp;导出</button>
</span> </span>
<span class="input-group-btn"> <span class="input-group-btn">
@@ -96,6 +105,7 @@
<th>平安券编号</th> <th>平安券编号</th>
<th>优惠政策</th> <th>优惠政策</th>
<th>核销金额</th> <th>核销金额</th>
<th>订单id</th>
<th>状态</th> <th>状态</th>
<th>处理结果</th> <th>处理结果</th>
<th>核销时间</th> <th>核销时间</th>
@@ -111,6 +121,7 @@
<td>{{ $coupon->redemptionCode }}</td> <td>{{ $coupon->redemptionCode }}</td>
<td>{{ $coupon->couponName }}</td> <td>{{ $coupon->couponName }}</td>
<td>{{ $coupon->price }}</td> <td>{{ $coupon->price }}</td>
<td>{{ $coupon->orderid }}</td>
<td>{{ $coupon->status_text }}</td> <td>{{ $coupon->status_text }}</td>
<td>{{ $coupon->remark }}</td> <td>{{ $coupon->remark }}</td>
<td>{{ $coupon->created_at }}</td> <td>{{ $coupon->created_at }}</td>