From c189ac641ca4e7151d38a7ba3d4c0ba044ba6484 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Sun, 27 Sep 2020 11:16:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Actions/Tools/SalesmanOption.php    | 20 +++++++++++++++----
 app/Admin/Common/Order.php                    | 16 +++++++++++++--
 app/Admin/Controllers/v3/Salesman.php         |  4 ++--
 app/Admin/Repositories/v3/Salesman.php        | 14 +++----------
 .../views/admin/tools/salesman.blade.php      | 20 +++++++++++++------
 5 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/app/Admin/Actions/Tools/SalesmanOption.php b/app/Admin/Actions/Tools/SalesmanOption.php
index 45918e3..3e33414 100644
--- a/app/Admin/Actions/Tools/SalesmanOption.php
+++ b/app/Admin/Actions/Tools/SalesmanOption.php
@@ -11,11 +11,23 @@ class SalesmanOption extends AbstractTool
 {
     protected function script()
     {
-        $url = request()->fullUrlWithQuery(['gender' => '_gender_']);
-
         return <<<JS
-$('input:radio.user-gender').change(function () {
-    var url = "$url".replace('_gender_', $(this).val());
+$('#today').change(function () {
+    var url = "salesman?type=today&option=1"
+    Dcat.reload(url);
+});
+$('#yesterday').change(function () {
+    var url = "salesman?type=yesterday&option=-1"
+
+    Dcat.reload(url);
+});
+$('#week').change(function () {
+    var url = "salesman?type=week&option=w"
+
+    Dcat.reload(url);
+});
+$('#month').change(function () {
+    var url = "salesman?type=month&option=30"
 
     Dcat.reload(url);
 });
diff --git a/app/Admin/Common/Order.php b/app/Admin/Common/Order.php
index 792285c..9d09dec 100644
--- a/app/Admin/Common/Order.php
+++ b/app/Admin/Common/Order.php
@@ -82,8 +82,20 @@ class Order
                 $endTime = mktime(0, 0, 0, date('m'), date('d') + 1, date('Y')) - 1;
                 break;
             case 'w':
-                $beginTime = mktime(0, 0, 0, date("m"), date("d") - date("w") + 1, date("Y"));
-                $endTime = mktime(23, 59, 59, date("m"), date("d") - date("w") + 7, date("Y"));
+                //$beginTime = mktime(0, 0, 0, date("m"), date("d") - date("w") + 1, date("Y"));
+                //$endTime = mktime(23, 59, 59, date("m"), date("d") - date("w") + 7, date("Y"));
+
+                //当前日期
+                $sdefaultDate = date("Y-m-d");
+                //$first =1 表示每周星期一为开始日期 0表示每周日为开始日期
+                $first=1;
+                //获取当前周的第几天 周日是 0 周一到周六是 1 - 6
+                $w=date('w',strtotime($sdefaultDate));
+                //获取本周开始日期，如果$w是0，则表示周日，减去 6 天
+                $beginTime=strtotime("$sdefaultDate -".($w ? $w - $first : 6).' days');
+                //本周结束日期
+                $start = date('Y-m-d',$beginTime);
+                $endTime=strtotime("$start +6 days")+86399;
                 break;
             case 'lw':
                 $beginTime = mktime(0, 0, 0, date("m"), date("d") - date("w") + 1 - 7, date("Y"));
diff --git a/app/Admin/Controllers/v3/Salesman.php b/app/Admin/Controllers/v3/Salesman.php
index a0ba78e..ea0d255 100644
--- a/app/Admin/Controllers/v3/Salesman.php
+++ b/app/Admin/Controllers/v3/Salesman.php
@@ -40,8 +40,8 @@ class Salesman extends AdminController
                 $grid->column('person_id','懒ID');
                 $grid->column('nick_name','拓展员');
                 $grid->column('total','社区总数');
-                $grid->column('t_num','今日订单数');
-                $grid->column('t_amount','今日成交额');
+                $grid->column('t_num','订单数');
+                $grid->column('t_amount','成交额');
                 $grid->disableActions();
                 $grid->filter(function (Grid\Filter $filter){
                     $filter->equal('person_id','拓展员懒ID');
diff --git a/app/Admin/Repositories/v3/Salesman.php b/app/Admin/Repositories/v3/Salesman.php
index 7fad51d..d76ed90 100644
--- a/app/Admin/Repositories/v3/Salesman.php
+++ b/app/Admin/Repositories/v3/Salesman.php
@@ -29,6 +29,7 @@ class Salesman extends EloquentRepository
         if ($userId){
             $build = $build->where('lanzu_user.id',$userId);
         }
+        $option = request()->get('option');
         //>>1.获取业务员
         $rows = $build->paginate(10)->toArray();
         //>>2.获取业务员下的所有社区的绑定用户
@@ -42,23 +43,14 @@ class Salesman extends EloquentRepository
                 'market_id'=>'',//取哪个市场数据
                 'condition'=>1,//取数据维度     condition
                 'user_ids'=>$uid?$uid:null
-            ],1);//今日订单数
-
+            ],$option);//今日订单数
             $value['t_amount'] = Order::getOrderData([
                 'user_type'=>'lanzu_biz',//谁取数据  user_type  用户类型
                 'data_type'=>'amount',//取什么数据    data_type   数据类型
                 'market_id'=>'',//取哪个市场数据
                 'condition'=>1,//取数据维度     condition
                 'user_ids'=>$uid?$uid:null
-            ],1);//今日订单金额
-
-            $value['m_amount'] = Order::getOrderData([
-                'user_type'=>'lanzu_biz',//谁取数据  user_type  用户类型
-                'data_type'=>'amount',//取什么数据    data_type   数据类型
-                'market_id'=>'',//取哪个市场数据
-                'condition'=>1,//取数据维度     condition
-                'user_ids'=>$uid?$uid:null
-            ],'30');//本月订单金额
+            ],$option);//今日订单金额
             unset($value['admin_user_id']);
             unset($value['user_id']);
         }
diff --git a/resources/views/admin/tools/salesman.blade.php b/resources/views/admin/tools/salesman.blade.php
index d194f2d..779c74c 100644
--- a/resources/views/admin/tools/salesman.blade.php
+++ b/resources/views/admin/tools/salesman.blade.php
@@ -1,7 +1,15 @@
-<div class="btn-group" data-toggle="buttons">
-    @foreach($options as $option => $label)
-        <label class="btn btn-default {{ request()->get('gender', 'all') == $option ? 'active' : '' }}">
-            <input type="radio" class="user-gender" value="{{ $option }}">{{$label}}
-        </label>
-    @endforeach
+
+<div class="btn-group btn-group-toggle" data-toggle="buttons">
+    <label class="btn btn-primary {{request()->get('type','today')=='today'? 'active':''}}">
+        <input type="radio" name="options" id="today" checked> 今日
+    </label>
+    <label class="btn btn-primary {{request()->get('type')=='yesterday'? 'active':''}}">
+        <input type="radio" name="options" checked id="yesterday"> 昨日
+    </label>
+    <label class="btn btn-primary {{request()->get('type')=='week'? 'active':''}}">
+        <input type="radio" name="options" id="week"> 本周
+    </label>
+    <label class="btn btn-primary {{request()->get('type')=='month'? 'active':''}}">
+        <input type="radio" name="options" id="month"> 本月
+    </label>
 </div>