git

app/api/controller/activity/WholeController.php

@@ -269,9 +269,13 @@ class WholeController
      */
     public function pool(Request $request)
     {
-        $sum = UserBill::where('category','gold')->where('pm',0)->value('sum(number)')?:0;
-        $count = UserBill::where('category','gold')->where('pm',0)->value('count(number)')?:0;
-        $data = UserBill::where('category','gold')->where('pm',0)->order('id desc')->page(input('page',1),input('limit',10))->select()->toArray();
+        $sum = Package::where('status','in',join(['-1','-2']))->value('sum(number)')?:0;
+        $sum1 = Package::where('status',2)->where('admin_id','>',0)->value('sum(number)')?:0;
+        $count = Package::where('status','in',join(['-1','-2']))->value('count(number)')?:0;
+        $count1 = Package::where('status',2)->where('admin_id','>',0)->value('count(number)')?:0;
+        $sum = $sum+$sum1;
+        $count = $count+$count1;
+        $data = Package::where('status','in',join(['-1','-2']))->whereor(['status'=>2,'admin_id'=>['gt',0]])->order('id desc')->page(input('page',1),input('limit',10))->select()->toArray();
         foreach ($data as &$v)
         {
             $v['user'] = User::find($v['uid'])->toArray();