git

app/api/controller/activity/WholeController.php

@@ -270,13 +270,13 @@ class WholeController
     public function pool(Request $request)
     {
         $sum = Package::where('status','in',join(",",['-1','-2']))->value('sum(use_integral)')?:0;
-        $sum1 = Package::where('status',2)->where('admin_id','>',0)->value('sum(use_integral)/2')?:0;
+        $sum1 = Package::where('admin_id','>',0)->value('sum(use_integral)/2')?:0;
         $count = Package::where('status','in',join(",",['-1','-2']))->value('count(use_integral)')?:0;
-        $count1 = Package::where('status',2)->where('admin_id','>',0)->value('count(use_integral)')?:0;
+        $count1 = Package::where('admin_id','>',0)->value('count(use_integral)')?:0;
         $sum = bcadd($sum,$sum1,2);
         $count = bcadd($count,$count1,2);
         $data = Package::where('status','in',join(",",['-1','-2']))->whereor(function ($query){
-            $query->where('status',2)->where('admin_id','>','0');
+            $query->where('admin_id','>','0');
         })->order('id desc')->page(input('page',1),input('limit',10))->select()->toArray();
         echo Package::getlastsql();
         foreach ($data as &$v)