From 245d5daa5002c18a7b000c4592938d942081e1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Mon, 24 Aug 2020 12:35:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=90=8E=E5=8F=B0=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80=E5=8D=A1=E5=88=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Coupon/IndexController.php    | 79 ++++---------------
 1 file changed, 17 insertions(+), 62 deletions(-)

diff --git a/app/Admin/Controllers/Coupon/IndexController.php b/app/Admin/Controllers/Coupon/IndexController.php
index 00a4e38..83ba2a0 100644
--- a/app/Admin/Controllers/Coupon/IndexController.php
+++ b/app/Admin/Controllers/Coupon/IndexController.php
@@ -26,7 +26,10 @@ class IndexController extends AdminController
         $grid->disableBatchActions();
         $grid->disableActions();
 
-        $grid->model()->whereIn('status', [2, 3])->orderBy('id', 'desc');
+        $grid->model()
+             ->with(['outlet.province', 'outlet.city', 'outlet.district', 'user', 'user.info'])
+             ->whereIn('status', [2, 3])
+             ->orderBy('id', 'desc');
 
         $grid->filter(function ($filter) {
             $filter->column(1 / 2, function ($filter) {
@@ -113,22 +116,21 @@ class IndexController extends AdminController
         });
 
         $grid->footer(function ($query) {
-            $all  = $query->get();
-            $pass = $all->where('status', 2)->all();
-            $pass = collect($pass);
+            // $all  = $query->get();
+            // $pass = $all->where('status', 2)->all();
+            // $pass = collect($pass);
+            $total   = $query->count();
+            $success = $query->where('status', 2)->count();
+            $faield  = $total - $success;
 
-            return '<label class="label label-success">全部:' . $all->count() . '张</label>&nbsp;&nbsp;'
-                   . '<label class="label label-success">成功:' . $pass->count() . '张</label>&nbsp;&nbsp;'
-                   . '<label class="label label-success">失败:' . $all->where('status', 3)
-                                                                    ->count() . '张</label>&nbsp;&nbsp;'
-                   . '<label class="label label-success">核销金额:' . $pass->sum('price') . '元</label>&nbsp;&nbsp;'
-                   . '<label class="label label-success">资金通道结算:' . $pass->sum('profit') . '元</label>&nbsp;&nbsp;'
-                   . '<label class="label label-success">打款金额:' . $pass->where('is_profit', 1)
-                                                                       ->sum('profit') . '元</label>&nbsp;&nbsp;';
+            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;';
         });
-
-
-
         $grid->disableExport(false);
 
         $grid->export(function ($export) {
@@ -150,51 +152,4 @@ class IndexController extends AdminController
         return $grid;
     }
 
-    /**
-     * Make a form builder.
-     * @return Form
-     */
-    protected function form()
-    {
-        $form = new Form(new Gift);
-
-        $form->text('title', '商品名称')->required();
-        $form->decimal('price', '价格')->required()->default('1');
-        $form->decimal('pv', 'PV')->required()->default(0);
-        $form->decimal('bonus', '主播佣金')->required()->default(0);
-        $form->decimal('recommend', '推荐人佣金')->required()->default(0);
-        $form->number('hots', '热度/亲密度')->required()->default('1');
-        $form->text('times', '显示时间')
-             ->default('200')
-             ->required()
-             ->help('礼物显示时间，毫秒');
-
-        $form->textarea('description', '礼物说明');
-
-        $form->image('cover', '封面')
-             ->rules(function ($form) {
-                 if ($form->model()->cover != '') {
-                     return 'nullable|image';
-                 } else {
-                     return 'required';
-                 }
-             })
-             ->move('images/' . date('Y/m/d'))
-             ->removable()
-             ->uniqueName();
-
-        $form->switch('status', '状态')->default(1);
-        $form->decimal('sort', '排序')->default(0)->help('序号越大越靠前');
-
-        $form->saving(function ($form) {
-            $sum = (int)$form->pv + (int)$form->bonus + (int)$form->recommend;
-            if ((int)$sum > $form->price) {
-                admin_warning('配置错误', 'PV+佣金+推荐人佣金不能超过礼物价值');
-                throw new \Exception('配置错误,PV+佣金+推荐人佣金不能超过礼物价值');
-            }
-        });
-
-        return $form;
-    }
-
 }