diff --git a/app/Merchant/Controllers/Unionpay/CouponController.php b/app/Merchant/Controllers/Unionpay/CouponController.php index f11bc4e..ccff3ae 100644 --- a/app/Merchant/Controllers/Unionpay/CouponController.php +++ b/app/Merchant/Controllers/Unionpay/CouponController.php @@ -30,17 +30,17 @@ class CouponController extends Controller $action = $request->action ?? 'search'; $coupons = 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); - }) + $q->where('coupon_no', $coupon_no); + }) ->when($shop_no, function ($q) use ($shop_no) { $q->where('shop_no', $shop_no); })