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; $end = $request->end;
UnionpayCoupon::query() UnionpayCoupon::query()
->whereHas('outlet', function ($q) use ($shop_name, $user) { // ->whereHas('outlet', function ($q) use ($shop_name, $user) {
$q->where('parent_id', $user->id) // $q->where('parent_id', $user->id)
->when($shop_name, function ($q) use ($shop_name) { // ->when($shop_name, function ($q) use ($shop_name) {
$q->whereHas('info', function ($q) use ($shop_name) { // $q->whereHas('info', function ($q) use ($shop_name) {
$q->where('nickname', 'like', "%{$shop_name}%"); // $q->where('nickname', 'like', "%{$shop_name}%");
}); // });
}); // });
}) // })
->when($coupon_no, function ($q) use ($coupon_no) { ->when($coupon_no, function ($q) use ($coupon_no) {
$q->where('coupon_no', $coupon_no); $q->where('coupon_no', $coupon_no);
}) })

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

@@ -52,20 +52,21 @@
</li> </li>
</ul> </ul>
</li> </li>
@if(Auth::guard('merchant')->user()->id==313)
<li> <li>
<a href="#"> <a href="#">
<i class="fa fa-users"></i> <i class="fa fa-users"></i>
<span class="nav-label">银联微信券管理</span> <span class="nav-label">银联微信券管理</span>
<span class="fa arrow"></span> <span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
<li> <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
</li> class="fa fa-list"></i>核销记录</a>
</ul> </li>
</li> </ul>
</li>
@endif
</ul> </ul>
</div> </div>
</nav> </nav>