diff --git a/app/Merchant/Controllers/Unionpay/CouponController.php b/app/Merchant/Controllers/Unionpay/CouponController.php index b6df174..2eca3d9 100644 --- a/app/Merchant/Controllers/Unionpay/CouponController.php +++ b/app/Merchant/Controllers/Unionpay/CouponController.php @@ -3,8 +3,6 @@ namespace App\Merchant\Controllers\Unionpay; use App\Merchant\Controllers\Controller; -use App\Models\ActivityRule; -use App\Models\Coupon; use Auth; use Illuminate\Http\Request; use XuanChen\UnionPay\Models\UnionpayCoupon; @@ -79,7 +77,7 @@ class CouponController extends Controller $response = function () use ($user, $request) { $handle = fopen('php://output', 'w'); $titles = [ - 'ID', '手机号', '门店名称', '优惠券券编号', '原始金额', '优惠的金额', '支付金额', '券码生效时间', '券码过期时间', '门店号', '状态', '核销时间', + 'ID', '手机号', '门店名称', '优惠券券编号', '原始金额', '优惠的金额', '支付金额', '门店号', '状态', '核销时间', ]; fputcsv($handle, $titles); @@ -125,8 +123,8 @@ class CouponController extends Controller $coupon->orig_amt / 100, $coupon->discount_amt / 100, $coupon->pay_amt / 100, - $coupon->effective_date_time, - $coupon->expire_date_time, + // $coupon->effective_date_time, + // $coupon->expire_date_time, $coupon->shop_no, $coupon->status_text, $coupon->updated_at, diff --git a/app/Merchant/Resources/views/unionpay/coupon.blade.php b/app/Merchant/Resources/views/unionpay/coupon.blade.php index a5ed609..6d9cb2b 100644 --- a/app/Merchant/Resources/views/unionpay/coupon.blade.php +++ b/app/Merchant/Resources/views/unionpay/coupon.blade.php @@ -97,14 +97,14 @@ {{ $coupon->id }} {{ $coupon->mobile }} - {{ $coupon->outlet ? $coupon->outlet->nickname : 'Id:' . $coupon->outletId }} + {{ $coupon->shop_no }} + {{ $coupon->outlet ? $coupon->outlet->nickname : '' }} {{ $coupon->coupon_no }} {{ $coupon->orig_amt/100 }} {{ $coupon->discount_amt/100 }} {{ $coupon->pay_amt/100 }} {{-- {{ $coupon->effective_date_time }}--}} {{-- {{ $coupon->expire_date_time }}--}} - {{ $coupon->shop_no }} {{ $coupon->status_text }} {{ $coupon->updated_at }}