|
|
@@ -143,8 +143,9 @@ class UserCouponLogic extends BaseLogic
|
|
|
public static function categoryCouponLists($params)
|
|
|
{
|
|
|
try{
|
|
|
- $coupon_ids = CouponCategory::where('goods_category_id',$params['goods_category_id'])->column('coupon_id');
|
|
|
-
|
|
|
+ $category_coupon_ids = CouponCategory::where('goods_category_id',$params['goods_category_id'])->column('coupon_id');
|
|
|
+ $goods_coupon_ids = !empty($params['goods_id'])?CouponGoods::where('goods_id',$params['goods_id'])->column('coupon_id'):[];
|
|
|
+ $coupon_ids = array_merge($category_coupon_ids,$goods_coupon_ids);
|
|
|
$data = CouponRules::where('remaining_count','>',0)
|
|
|
->where('coupon_type',1)
|
|
|
->whereIn('id',$coupon_ids)
|