返回红包活动列表带上已经添加的次数

app/Http/Controllers/IntegralsController.php

@@ -7,7 +7,6 @@ namespace App\Http\Controllers;
 use App\Http\Filters\IntegralFilter;
 use App\Http\Filters\IntegralFilter;
 use App\Models\Integral;
 use App\Models\Integral;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
 
 
 /**
 /**
@@ -41,9 +40,9 @@ class IntegralsController extends Controller
     {
     {
         $page = $request->has('page') ? $request->page : self::DEFAULT_PAGE;
         $page = $request->has('page') ? $request->page : self::DEFAULT_PAGE;
         $pageSize = $request->has('page_size') ? $request->page_size : self::DEFAULT_PAGE_SIZE;
         $pageSize = $request->has('page_size') ? $request->page_size : self::DEFAULT_PAGE_SIZE;
-
+        $userId = $request->get('user_id');
         if ($request->has('is_api') && $request->is_api) {
         if ($request->has('is_api') && $request->is_api) {
-            $result = $integral->getIntegralListForApi();
+            $result = $integral->getIntegralListForApi($userId);
         } else {
         } else {
             $result = $integral->getIntegralList($page, $pageSize, $filter);
             $result = $integral->getIntegralList($page, $pageSize, $filter);
         }
         }
@@ -154,6 +153,7 @@ class IntegralsController extends Controller
         $ids = $request->get('ids');
         $ids = $request->get('ids');
         if (!is_array($ids)) {
         if (!is_array($ids)) {
             Log::Info('批量修改参数不是数组');
             Log::Info('批量修改参数不是数组');
+
             return $this->Export(44, '批量修改参数不是数组');
             return $this->Export(44, '批量修改参数不是数组');
         }
         }
         $status = $request->status;
         $status = $request->status;

app/Models/Integral.php

@@ -53,7 +53,7 @@ class Integral extends Model
     }
     }
 
 
     //获取红包活动列表,给API使用
     //获取红包活动列表,给API使用
-    public function getIntegralListForApi()
+    public function getIntegralListForApi($userId)
     {
     {
         //先从redis里面查询是否有列表,没有的话从MySQL里面取出并且放入redis
         //先从redis里面查询是否有列表,没有的话从MySQL里面取出并且放入redis
         $redis = new RedisModel();
         $redis = new RedisModel();
@@ -66,10 +66,17 @@ class Integral extends Model
                 $count = Integral::where('status', 1)->count();
                 $count = Integral::where('status', 1)->count();
                 $integrals = $this->addIntegralListToRedis();
                 $integrals = $this->addIntegralListToRedis();
             }
             }
+
         } else {
         } else {
             $count = $redis->hlen('ic_welfare_integrals');
             $count = $redis->hlen('ic_welfare_integrals');
         }
         }
 
 
+        //处理列表,把不同红包活动今天已使用次数显示出来
+        foreach ($integrals as $key => $integral) {
+            $addCount = $redis->hget('ic_welfare_integral_limit_' . $integral['id'], $userId);
+            $integrals[$key]['add_count'] = empty($addCount) ? 0 : (int)$addCount;
+        }
+
         if ($integrals) {
         if ($integrals) {
             $integrals = arraySequence($integrals, 'id', 'SORT_ASC');
             $integrals = arraySequence($integrals, 'id', 'SORT_ASC');
         }
         }