Merge branch 'develop' into 1.x

app/Admin/Controllers/DealerController.php

@@ -88,8 +88,9 @@ class DealerController extends AdminController
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();
                 $filter->equal('user.phone')->width(3);
-                $filter->equal('userInfo.nickname')->width(3);
                 $filter->equal('userInfo.inviterInfo.user.phone')->width(3);
+                $filter->equal('userInfo.realInviterInfo.user.phone')->width(3);
+                $filter->equal('userInfo.nickname')->width(4);
             });
         });
     }

app/Admin/Controllers/DealerOrderController.php

@@ -107,7 +107,11 @@ class DealerOrderController extends AdminController
                         $actions->append(new DealerOrderShipping());
                     }
                 }
-                if ($actions->row->isPending() && Admin::user()->can('dcat.admin.dealer_orders.cancel')) {
+                if ((
+                        $actions->row->isPending() //待确认
+                        || $actions->row->isPay() //待付款
+                        || $actions->row->isPaid() //待收款
+                    ) && Admin::user()->can('dcat.admin.dealer_orders.cancel')) {
                     $actions->append(new DealerOrderCancel());
                 }
             });

app/Admin/Metrics/StatisticsTotal.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Metrics;
 
 use App\Models\Balance;
+use App\Models\DealerWallet;
 use App\Models\DistributionPreIncome;
 use App\Models\UserInfo;
 use App\Models\Wallet;
@@ -40,6 +41,7 @@ class StatisticsTotal extends RadialBar
             'total_distribution'=> DistributionPreIncome::unsettlement()->sum('total_revenue'),
             'total_quota_v2' => UserInfo::sum('quota_v2'),
             'total_quota_v1' => UserInfo::sum('quota_v1'),
+            'total_dealer_wallet' => bcdiv(DealerWallet::sum('balance'), 1, 2),
         ]);
     }
 
@@ -82,6 +84,10 @@ class StatisticsTotal extends RadialBar
         <h1 class="font-lg-1 mt-2 mb-0">{$content['total_quota_v1']}</h1>
         老配额
     </div>
+    <div class="col-sm-4">
+        <h1 class="font-lg-1 mt-2 mb-0">{$content['total_dealer_wallet']}</h1>
+        批零余额
+    </div>
 </div>
 HTML
         );