From ff48a3d7c6030b9ca853e8bf0262ddde5b47788d Mon Sep 17 00:00:00 2001 From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com> Date: Sat, 18 Jul 2020 15:58:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B1=E6=95=88=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/CouponController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php index 822c23d..f1ea847 100644 --- a/app/Controller/CouponController.php +++ b/app/Controller/CouponController.php @@ -30,7 +30,9 @@ class CouponController extends BaseController $c_ids = CouponUserRecType::where('receive_type',$receive_type)->pluck('system_coupon_user_id'); $nowTime = time(); - $cr_ids = CouponRec::where('user_id',$user_id)->pluck('system_coupon_user_id'); + $cr_ids = CouponRec::where( + 'user_id',$user_id + )->pluck('system_coupon_user_id'); $ids = array_merge($c_ids->toArray(),$cr_ids->toArray()); @@ -40,6 +42,7 @@ class CouponController extends BaseController ->where([ ['u.end_time','>',$nowTime], ['u.start_time','<=',$nowTime], + ['type.receive_type','=',$receive_type], ['u.status','=',1], ]) ->join('ims_system_coupon_user_receivetype as type', 'u.id', '=', 'type.system_coupon_user_id')