diff --git a/app/Controller/CouponRebateController.php b/app/Controller/CouponRebateController.php index 9c78b87..202a0a3 100644 --- a/app/Controller/CouponRebateController.php +++ b/app/Controller/CouponRebateController.php @@ -28,6 +28,9 @@ class CouponRebateController extends BaseController * @var CouponRebateInterface */ protected $CouponRebate; + /** + * 用户是否领取过领取优惠券 + */ public function isCouponRebate() { $user_id = $this->request->input('user_id', 0); @@ -36,8 +39,19 @@ class CouponRebateController extends BaseController } /** + * 返回活动信息 + */ + public function getActiveInfo() + { + $res = $this->CouponRebate->getActiveInfo(); + return $this->success($res); + } + + + /** + * 用户领取优惠券 * 用户领取优惠券 2020.08.04 只领一张 - */ + */ public function userReceiveCoupon(CouponRebateReceiveRequest $validator) { $userId = $this->request->input("user_id", 0); @@ -65,12 +79,12 @@ class CouponRebateController extends BaseController return $this->success($return); } - Db::transaction( function () use ($id,$receiveType,$userId,$sendUserId,$phone,&$success,&$fail,$now) { + Db::transaction( function () use ($id,$receiveType,$userId,$sendUserId,$phone,&$return,$now) { //读写锁,完全控制,性能低 $cp = Coupon::where('id', $id)->lockForUpdate() ->select('id','title','status','inventory','inventory_use','start_time','end_time','full_amount','discounts') ->first(); - + $where = [ 'system_coupon_user_id' => $cp->id, ]; diff --git a/app/CouponRebate/CouponRebate.php b/app/CouponRebate/CouponRebate.php index 60438a1..d61e2d8 100644 --- a/app/CouponRebate/CouponRebate.php +++ b/app/CouponRebate/CouponRebate.php @@ -24,4 +24,14 @@ class CouponRebate implements CouponRebateInterface return $res; } + public function getActiveInfo() + { + $res = Db::table('ims_system_coupon_user') + ->where([ + ['active_type','=',2], + ]) + ->get(); + return $res; + } + } \ No newline at end of file diff --git a/app/CouponRebate/CouponRebateInterface.php b/app/CouponRebate/CouponRebateInterface.php index 8c63313..385f1a7 100644 --- a/app/CouponRebate/CouponRebateInterface.php +++ b/app/CouponRebate/CouponRebateInterface.php @@ -7,4 +7,6 @@ interface CouponRebateInterface public function isCouponRebate($user_id); + public function getActiveInfo(); + } \ No newline at end of file diff --git a/config/routes.php b/config/routes.php index 547837f..0db0115 100644 --- a/config/routes.php +++ b/config/routes.php @@ -28,4 +28,5 @@ Router::addGroup('/v1/',function (){ Router::post('Ad/banners', 'App\Controller\AdController@banners'); Router::post('CouponRebate/isCouponRebate', 'App\Controller\CouponRebateController@isCouponRebate'); Router::post('CouponRebate/userReceiveCoupon', 'App\Controller\CouponRebateController@userReceiveCoupon'); + Router::post('CouponRebate/getActiveInfo', 'App\Controller\CouponRebateController@getActiveInfo'); }); \ No newline at end of file