From 64e22c020deb5ae76ae8183f639dd79a2b69405b Mon Sep 17 00:00:00 2001
From: xuanchen120 <122383162@qq.com>
Date: Thu, 10 Feb 2022 15:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Coupon/IndexController.php    | 10 +++++-----
 .../Coupon/SettleCouponController.php         | 19 ++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/Admin/Controllers/Coupon/IndexController.php b/app/Admin/Controllers/Coupon/IndexController.php
index 884229c..0f152f8 100644
--- a/app/Admin/Controllers/Coupon/IndexController.php
+++ b/app/Admin/Controllers/Coupon/IndexController.php
@@ -130,16 +130,16 @@ class IndexController extends AdminController
             // $all  = $query->get();
             // $pass = $all->where('status', 2)->all();
             // $pass = collect($pass);
-            $total   = $query->count();
-            $success = $query->where('status', 2)->count();
+            $total   = (clone $query)->count();
+            $success = (clone $query)->where('status', 2)->count();
             $faield  = $total - $success;
 
             return '<label class="label label-success">全部:'.$total.'张</label>&nbsp;&nbsp;'
                 .'<label class="label label-success">成功:'.$success.'张</label>&nbsp;&nbsp;'
                 .'<label class="label label-success">失败:'.$faield.'张</label>&nbsp;&nbsp;'
-                .'<label class="label label-success">核销金额:'.$query->sum('price').'元</label>&nbsp;&nbsp;'
-                .'<label class="label label-success">资金通道结算:'.$query->sum('profit').'元</label>&nbsp;&nbsp;'
-                .'<label class="label label-success">打款金额:'.$query->where('is_profit', 1)
+                .'<label class="label label-success">核销金额:'.(clone $query)->sum('price').'元</label>&nbsp;&nbsp;'
+                .'<label class="label label-success">资金通道结算:'.(clone $query)->sum('profit').'元</label>&nbsp;&nbsp;'
+                .'<label class="label label-success">打款金额:'.(clone $query)->where('is_profit', 1)
                     ->sum('profit').'元</label>&nbsp;&nbsp;';
         });
         $grid->disableExport(false);
diff --git a/app/Admin/Controllers/Coupon/SettleCouponController.php b/app/Admin/Controllers/Coupon/SettleCouponController.php
index d40a36a..3d2b663 100644
--- a/app/Admin/Controllers/Coupon/SettleCouponController.php
+++ b/app/Admin/Controllers/Coupon/SettleCouponController.php
@@ -12,7 +12,7 @@ use Encore\Admin\Grid;
 class SettleCouponController extends AdminController
 {
 
-    protected $title = '平安核销全列表';
+    protected $title = '平安券核销列表';
 
     /**
      * Notes:
@@ -36,7 +36,7 @@ class SettleCouponController extends AdminController
         $grid->model()
             ->where('type', 1)
             ->with(['outlet.province', 'outlet.city', 'outlet.district', 'user', 'user.info'])
-            ->whereIn('status', [2])
+            ->where('status', 2)
             ->orderBy('id', 'desc');
 
         $grid->filter(function ($filter) {
@@ -110,18 +110,15 @@ class SettleCouponController extends AdminController
         });
 
         $grid->footer(function ($query) {
-            $total   = $query->count();
-            $success = $query->where('status', 2)->count();
-            $faield  = $total - $success;
+            $total = (clone $query)->count();
+            $no    = (clone $query)->where('is_settle', 0)->count();
+            $yes   = $total - $no;
 
             return '<label class="label label-success">全部:'.$total.'张</label>&nbsp;&nbsp;'
-                .'<label class="label label-success">成功:'.$success.'张</label>&nbsp;&nbsp;'
-                .'<label class="label label-success">失败:'.$faield.'张</label>&nbsp;&nbsp;'
-                .'<label class="label label-success">核销金额:'.$query->sum('price').'元</label>&nbsp;&nbsp;'
-                .'<label class="label label-success">资金通道结算:'.$query->sum('profit').'元</label>&nbsp;&nbsp;'
-                .'<label class="label label-success">打款金额:'.$query->where('is_profit', 1)
-                    ->sum('profit').'元</label>&nbsp;&nbsp;';
+                .'<label class="label label-success">已结算:'.$yes.'张</label>&nbsp;&nbsp;'
+                .'<label class="label label-success">未结算:'.$no.'张</label>&nbsp;&nbsp;';
         });
+
         $grid->disableExport(false);
 
         $grid->export(function ($export) {