|
@@ -269,10 +269,10 @@ class WholeController
|
|
|
*/
|
|
*/
|
|
|
public function pool(Request $request)
|
|
public function pool(Request $request)
|
|
|
{
|
|
{
|
|
|
- $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 = 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;
|
|
|
|
|
+ $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;
|
|
|
$sum = $sum+$sum1;
|
|
$sum = $sum+$sum1;
|
|
|
$count = $count+$count1;
|
|
$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();
|
|
$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();
|