Merge branch '11_02_marster'

app/Admin/Actions/Excel/SalesMan.php

@@ -84,11 +84,13 @@ class SalesMan implements FromArray, WithStrictNullComparison
 
             })
             ->get()->toArray();
+        list($beginTime,$endTime) = Order::beginAndEnd($option);
 
         foreach ($data as &$value) {
             //>>1.获取绑定后下过单的用户
-            $value['user_num'] = LanzuUserRelationBind::where('source_id', $value['admin_user_id'])->count();
+            $value['user_num'] = LanzuUserRelationBind::where('source_id', $value['admin_user_id'])->whereBetween('created_at',[$beginTime,$endTime])->count();
             $uid = Order::getUserOrder($value['admin_user_id']);
+            
             //>>2.获取订单数据
             $value['order_user_num'] = Order::getOrderData([
                 'user_type' => 'lanzu_biz',//谁取数据  user_type  用户类型

app/Admin/Controllers/LanzuFinancialRecord.php

@@ -40,6 +40,7 @@ class LanzuFinancialRecord extends AdminController
             $grid->paginate(10);
             $grid->id;
             $grid->user_id('用户')->display(function () {
+
                 if ($this->user_type == 1) {
                     $name = ImsCjdcUser::find($this->user_id)->name;
                 } else {