diff --git a/app/Merchant/Controllers/Unionpay/CouponController.php b/app/Merchant/Controllers/Unionpay/CouponController.php index f340464..05d3ff7 100644 --- a/app/Merchant/Controllers/Unionpay/CouponController.php +++ b/app/Merchant/Controllers/Unionpay/CouponController.php @@ -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); }) diff --git a/app/Merchant/Resources/views/common/menu.blade.php b/app/Merchant/Resources/views/common/menu.blade.php index 166665c..d728813 100644 --- a/app/Merchant/Resources/views/common/menu.blade.php +++ b/app/Merchant/Resources/views/common/menu.blade.php @@ -52,20 +52,21 @@ - -
  • - - - 银联微信券管理 - - - -
  • - + @if(Auth::guard('merchant')->user()->id==313) +
  • + + + 银联微信券管理 + + + +
  • + @endif