-1

application/api/service/CouponService.php

@@ -141,9 +141,11 @@ class CouponService{
         $count_where['user_id'] = $user_id;
 
         foreach ($activity_data as $k=>$v) {
+            if ($v['total'] != -1) {
                 if ($v['total'] - $v['get_number'] <= 0 ) {
                     continue;
                 }
+            }
 
             if ($type == 0) {
                 $count_where['invitee_id'] = $invitee_id;
@@ -153,6 +155,7 @@ class CouponService{
                 }
             }
 
+            if ($v['available'] != -1) {
                 $where['user_id'] = $user_id;
                 $where['activity_id'] = $v['id'];
                 $where['status']  = ['<>',2];
@@ -160,6 +163,8 @@ class CouponService{
                 if ($num > $v['available']) {
                     continue;
                 }
+            }
+
 
             if (strtotime($v['activity_start_time']) < $time && strtotime($v['activity_end_time']) > $time) {
                 $return_activity[] = $v;