From a04494c30e6a4314cc084de5ec9ef11752095c41 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Mon, 22 Feb 2021 17:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B8=A0=E9=81=93=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Census/IndexController.php    | 28 +++++++++----------
 .../Resources/views/census/index.blade.php    | 17 +++++++----
 app/Models/UserCode.php                       |  5 ++++
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/Merchant/Controllers/Census/IndexController.php b/app/Merchant/Controllers/Census/IndexController.php
index 3f980ec..f68b540 100644
--- a/app/Merchant/Controllers/Census/IndexController.php
+++ b/app/Merchant/Controllers/Census/IndexController.php
@@ -6,6 +6,7 @@ use App\Merchant\Controllers\Controller;
 use App\Merchant\Exporters\CensusExport;
 use App\Models\ActivityRule;
 use App\Models\Coupon;
+use App\Models\UserCode;
 use Auth;
 use Illuminate\Http\Request;
 
@@ -21,26 +22,23 @@ class IndexController extends Controller
 
         $coupons = Coupon::where('user_id', $user->id)
                          ->whereYear('created_at', $month[0])
-                         ->whereMonth('created_at', $month[1])
+            //                         ->whereMonth('created_at', $month[1])
                          ->where('status', 2)
                          ->get(['id', 'thirdPartyGoodsId', 'created_at']);
 
-        $rules = ActivityRule::get();
+        $rules = $user->code;
 
-        $coupons = $coupons->groupBy('create_day')->map(function ($items, $key) use ($rules) {
-            $data = [
-                'day' => $key,
-                //                'ysd10'  => $items->where('thirdPartyGoodsId', 'YSD-full100-10')->count(),
-                //                'ysd25'  => $items->where('thirdPartyGoodsId', 'YSD-full100-25')->count(),
-                //                'ysd50'  => $items->where('thirdPartyGoodsId', 'YSD-full100-50')->count(),
-                //                'ysd100' => $items->where('thirdPartyGoodsId', 'YSD-full200-100')->count(),
-            ];
-            foreach ($rules as $rule) {
-                $data[$rule->code] = $items->where('thirdPartyGoodsId', $rule->code)->count();
-            }
+        $coupons = $coupons->groupBy('create_day')
+                           ->map(function ($items, $key) use ($rules) {
+                               $data = [
+                                   'day' => $key,
+                               ];
+                               foreach ($rules as $rule) {
+                                   $data[$rule->code] = $items->where('thirdPartyGoodsId', $rule->code)->count();
+                               }
 
-            return collect($data);
-        });
+                               return collect($data);
+                           });
 
         $all = [];
         foreach ($rules as $rule) {
diff --git a/app/Merchant/Resources/views/census/index.blade.php b/app/Merchant/Resources/views/census/index.blade.php
index 282a61a..63881f3 100644
--- a/app/Merchant/Resources/views/census/index.blade.php
+++ b/app/Merchant/Resources/views/census/index.blade.php
@@ -7,7 +7,8 @@
 @endsection
 
 @push('script')
-    <script type="text/javascript" src="{{ asset('assets/merchant/js/plugins/datapicker/bootstrap-datepicker.js') }}"></script>
+    <script type="text/javascript"
+            src="{{ asset('assets/merchant/js/plugins/datapicker/bootstrap-datepicker.js') }}"></script>
     <script type="text/javascript">
         $("#time-interval .input-daterange").datepicker({
             autoclose: true, //自动关闭
@@ -36,18 +37,22 @@
     <div class="ibox">
         <div class="row">
             <div class="col-sm-12 m-b">
-                <form action="{{ route('merchant.census')}}" class="form-inline pull-right" method="get" accept-charset="utf-8">
+                <form action="{{ route('merchant.census')}}" class="form-inline pull-right" method="get"
+                      accept-charset="utf-8">
                     <div class="form-group" id="time-interval">
                         <div class="input-daterange input-group">
-                            <input type="text" class="input-sm form-control" placeholder="核销月份" readonly name="month" value="{{ Request::input('month')??now()->format('Y-m') }}"/>
+                            <input type="text" class="input-sm form-control" placeholder="核销月份" readonly name="month"
+                                   value="{{ Request::input('month')??now()->format('Y-m') }}"/>
                         </div>
                     </div>
 
                     <div class="input-group">
                     <span class="input-group-btn">
                         <input type="hidden" name="action" value="search">
-                        <button type="button" class="btn btn-sm btn-primary" data-action="search"><i class="fa fa-check"></i>&nbsp;刷新</button>
-                        <button type="button" class="btn btn-sm btn-warning confirm" tip='确认要导出当前条件内容？' data-action="excel"><i class="fa fa-paste"></i>&nbsp;导出</button>
+                        <button type="button" class="btn btn-sm btn-primary" data-action="search"><i
+                                    class="fa fa-check"></i>&nbsp;刷新</button>
+                        <button type="button" class="btn btn-sm btn-warning confirm" tip='确认要导出当前条件内容？'
+                                data-action="excel"><i class="fa fa-paste"></i>&nbsp;导出</button>
                     </span>
                     </div>
                 </form>
@@ -60,7 +65,7 @@
                     <tr>
                         <th>日期</th>
                         @foreach ($rules as $rule)
-                            <th>{{ $rule->title }}</th>
+                            <th>{{ $rule->rule->title }}</th>
                         @endforeach
                         <th></th>
                     </tr>
diff --git a/app/Models/UserCode.php b/app/Models/UserCode.php
index 85c416e..7bd2c59 100644
--- a/app/Models/UserCode.php
+++ b/app/Models/UserCode.php
@@ -10,4 +10,9 @@ class UserCode extends Model
         'profit' => 'array',
     ];
 
+    public function rule()
+    {
+        return $this->hasOne(ActivityRule::class, 'code', 'code');
+    }
+
 }