diff --git a/app/Controller/CouponRebateController.php b/app/Controller/CouponRebateController.php index 39fbb14..1c856f3 100644 --- a/app/Controller/CouponRebateController.php +++ b/app/Controller/CouponRebateController.php @@ -50,7 +50,7 @@ class CouponRebateController extends BaseController /** * 用户领取优惠券 - * 用户领取优惠券 2020.08.04 只领一张 + * 2020.08.04 只领一张优惠券 */ public function userReceiveCoupon(CouponRebateReceiveRequest $validator) { @@ -73,7 +73,7 @@ class CouponRebateController extends BaseController $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, ]; @@ -83,7 +83,7 @@ class CouponRebateController extends BaseController } // 查询领取类型一次能领取的数量 $crt = CouponUserRecType::where($where)->first(); - + $cr = new CouponRec; $cr->user_id = $userId; $cr->system_coupon_user_id = $cp->id; @@ -96,7 +96,7 @@ class CouponRebateController extends BaseController $cr->receive_type = $receiveType; $cr->send_user_id = $sendUserId; $cr->phone = $phone; - + //如果优惠卷库存小于等于已领取的数量 或者 未在活动时间内, 则返回领取失败的优惠券 if ( $cp->status != 1 @@ -105,9 +105,9 @@ class CouponRebateController extends BaseController || $cp->inventory < ($cp->inventory_use+$cr->number) || - $cp->start_time < $now + $cp->start_time > $now || - $cp->end_time > $now + $cp->end_time < $now ) { $return['status'] = 2; @@ -116,11 +116,8 @@ class CouponRebateController extends BaseController $cp->inventory_use += $cr->number;//记录已领取的数量 if ( $cr->save() && $cp->save() ) { $return['status'] = 0; - $return['data'] = $cps; - $return['coupon_text'] = $cps['discounts'].'元红包'; - } else { - $return['status'] = 3; - $return['coupon_text'] = '下次继续努力~'; + $return['data'] = $cp; + $return['coupon_text'] = $cp['discounts'].'元红包'; } }