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:09:40 +08:00
parent 41022e2a61
commit 8e964b860d
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,14 +89,14 @@ class CouponController extends Controller
$end = $request->end;
UnionpayCoupon::query()
->whereHas('outlet', function ($q) use ($shop_name, $user) {
$q->where('parent_id', $user->id)
->when($shop_name, function ($q) use ($shop_name) {
$q->whereHas('info', function ($q) use ($shop_name) {
$q->where('nickname', 'like', "%{$shop_name}%");
});
});
})
// ->whereHas('outlet', function ($q) use ($shop_name, $user) {
// $q->where('parent_id', $user->id)
// ->when($shop_name, function ($q) use ($shop_name) {
// $q->whereHas('info', function ($q) use ($shop_name) {
// $q->where('nickname', 'like', "%{$shop_name}%");
// });
// });
// })
->when($coupon_no, function ($q) use ($coupon_no) {
$q->where('coupon_no', $coupon_no);
})

7
app/Merchant/Resources/views/common/menu.blade.php
View File

@@ -52,7 +52,7 @@
</li>
</ul>
</li>
@if(Auth::guard('merchant')->user()->id==313)
<li>
<a href="#">
<i class="fa fa-users"></i>
@@ -61,11 +61,12 @@
</a>
<ul class="nav nav-second-level">
<li>
<a class="J_menuItem" href="{{ route('merchant.unionpay.coupons') }}"><i class="fa fa-list"></i>核销记录</a>
<a class="J_menuItem" href="{{ route('merchant.unionpay.coupons') }}"><i
class="fa fa-list"></i>核销记录</a>
</li>
</ul>
</li>
@endif
</ul>
</div>
</nav>