|
|
@@ -62,7 +62,6 @@ class Coupon extends Base
|
|
|
if(!$coupon_id) continue;
|
|
|
// 优惠券详情
|
|
|
$coupon_info = CouponConfig::where('id',$coupon_id)->find()->toArray();
|
|
|
- var_dump($coupon_info['id']);
|
|
|
// 优惠券是否是正常状态
|
|
|
if($coupon_info['status'] !=1 || $coupon_info['is_deleted'] == 1) continue;
|
|
|
// 检查优惠券活动数量
|
|
|
@@ -75,7 +74,8 @@ class Coupon extends Base
|
|
|
}
|
|
|
if(empty($get_ids)) $this->error('没有优惠活动或已获得');
|
|
|
$list = UserCouponList::where([['l.user_id','=',$this->user_id],['id','in',$get_ids]])
|
|
|
- ->alias('l.*,c.title,c.module,c.coupon_type,c.is_new')
|
|
|
+ ->alias('l')
|
|
|
+ ->field('l.*,c.title,c.module,c.coupon_type,c.is_new')
|
|
|
->leftJoin('CouponConfig c','c.id = l.coupon_id')
|
|
|
->limit($this->off_set,$this->page_num)
|
|
|
->order('l.id desc')
|
|
|
@@ -111,7 +111,8 @@ class Coupon extends Base
|
|
|
$status = input('get.status',1);
|
|
|
$module = input('get.module',1);
|
|
|
$list = UserCouponList::where(['l.user_id'=>$this->user_id,'l.status'=>$status])
|
|
|
- ->alias('l.*,c.title,c.module,c.coupon_type,c.is_new')
|
|
|
+ ->alias('l')
|
|
|
+ ->field('l.*,c.title,c.module,c.coupon_type,c.is_new')
|
|
|
->when($module,function ($query)use ($module){
|
|
|
if($module > 1 ) $query->where('module','in','1,'. $module);
|
|
|
})->leftJoin('CouponConfig c','c.id = l.coupon_id')
|
