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

测试

Browse Source
This commit is contained in:
徐永宾
2021-07-30 15:18:29 +08:00
parent 4175683450
commit 95d5193e2d
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Merchant/Controllers/Unionpay/CouponController.php
View File

@@ -3,8 +3,6 @@
namespace App\Merchant\Controllers\Unionpay; namespace App\Merchant\Controllers\Unionpay;
use App\Merchant\Controllers\Controller; use App\Merchant\Controllers\Controller;
use App\Models\ActivityRule;
use App\Models\Coupon;
use Auth; use Auth;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use XuanChen\UnionPay\Models\UnionpayCoupon; use XuanChen\UnionPay\Models\UnionpayCoupon;
@@ -79,7 +77,7 @@ class CouponController extends Controller
$response = function () use ($user, $request) { $response = function () use ($user, $request) {
$handle = fopen('php://output', 'w'); $handle = fopen('php://output', 'w');
$titles = [ $titles = [
'ID', '手机号', '门店名称', '优惠券券编号', '原始金额', '优惠的金额', '支付金额', '券码生效时间', '券码过期时间', '门店号', '状态', '核销时间', 'ID', '手机号', '门店名称', '优惠券券编号', '原始金额', '优惠的金额', '支付金额', '门店号', '状态', '核销时间',
]; ];
fputcsv($handle, $titles); fputcsv($handle, $titles);
@@ -125,8 +123,8 @@ class CouponController extends Controller
$coupon->orig_amt / 100, $coupon->orig_amt / 100,
$coupon->discount_amt / 100, $coupon->discount_amt / 100,
$coupon->pay_amt / 100, $coupon->pay_amt / 100,
$coupon->effective_date_time, // $coupon->effective_date_time,
$coupon->expire_date_time, // $coupon->expire_date_time,
$coupon->shop_no, $coupon->shop_no,
$coupon->status_text, $coupon->status_text,
$coupon->updated_at, $coupon->updated_at,

4
app/Merchant/Resources/views/unionpay/coupon.blade.php
View File

@@ -97,14 +97,14 @@
<tr> <tr>
<td> {{ $coupon->id }} </td> <td> {{ $coupon->id }} </td>
<td> {{ $coupon->mobile }} </td> <td> {{ $coupon->mobile }} </td>
<td>{{ $coupon->outlet ? $coupon->outlet->nickname : 'Id:' . $coupon->outletId }}</td> <td>{{ $coupon->shop_no }}</td>
<td>{{ $coupon->outlet ? $coupon->outlet->nickname : '' }}</td>
<td>{{ $coupon->coupon_no }}</td> <td>{{ $coupon->coupon_no }}</td>
<td>{{ $coupon->orig_amt/100 }}</td> <td>{{ $coupon->orig_amt/100 }}</td>
<td>{{ $coupon->discount_amt/100 }}</td> <td>{{ $coupon->discount_amt/100 }}</td>
<td>{{ $coupon->pay_amt/100 }}</td> <td>{{ $coupon->pay_amt/100 }}</td>
{{-- <td>{{ $coupon->effective_date_time }}</td>--}} {{-- <td>{{ $coupon->effective_date_time }}</td>--}}
{{-- <td>{{ $coupon->expire_date_time }}</td>--}} {{-- <td>{{ $coupon->expire_date_time }}</td>--}}
<td>{{ $coupon->shop_no }}</td>
<td>{{ $coupon->status_text }}</td> <td>{{ $coupon->status_text }}</td>
<td>{{ $coupon->updated_at }}</td> <td>{{ $coupon->updated_at }}</td>
</tr> </tr>