优惠券返券活动--只有加进活动的券才返回

app/Service/CouponService.php

@@ -70,8 +70,8 @@ class CouponService implements CouponServiceInterface
         // 当前用户可领的优惠券ID
         $couponIds = array_diff($c_ids, $cr_ids);
 
-        // 获取领取型优惠券 
-        $couponIds = $couponActivity['forward'] === false ? $couponIds : array_merge($couponIds,explode(',',$couponActivity['forward']));
+        // 转发型优惠券 
+        $couponReceiveIds = $couponActivity === false ? [] : explode(',',$couponActivity['forward']);
 
         $whereC = [
             ['u.end_time','>',$nowTime],
@@ -97,7 +97,7 @@ class CouponService implements CouponServiceInterface
 
             if($v->active_type == 1){
                 $result['not_receive'][] = $v;
-            }else if($v->active_type == 2){
+            }else if($v->active_type == 2 && in_array($v->id,$couponReceiveIds)){
                 $result['jump_data']['coupons'][] = $v->id;
             }