|
|
|
@ -114,8 +114,7 @@ class CouponRecService implements CouponRecServiceInterface |
|
|
|
case 'unused': |
|
|
|
$builder = $builder->where([ |
|
|
|
['lanzu_coupon.usable_end_time' ,'>', time()], |
|
|
|
['lanzu_coupon_receive.number_remain' ,'>', 0], |
|
|
|
['lanzu_coupon.status','=',1] |
|
|
|
['lanzu_coupon_receive.number_remain' ,'>', 0] |
|
|
|
]) |
|
|
|
->whereIn('lanzu_coupon_receive.status',[0,1]); |
|
|
|
break; |
|
|
|
@ -124,8 +123,7 @@ class CouponRecService implements CouponRecServiceInterface |
|
|
|
break; |
|
|
|
case 'expired': |
|
|
|
$builder = $builder->where(function ($query) { |
|
|
|
$query->where('lanzu_coupon.usable_end_time', '<', time()) |
|
|
|
->orWhere('lanzu_coupon.status', '<>', 1); |
|
|
|
$query->where('lanzu_coupon.usable_end_time', '<', time()); |
|
|
|
}); |
|
|
|
break; |
|
|
|
} |
|
|
|
|