订单列表，统计栏数据，未根据筛选条件变动

app/common/repositories/store/order/StoreOrderRepository.php

@@ -4632,34 +4632,34 @@ class StoreOrderRepository extends BaseRepository
         return compact('all', 'statusAll', 'unpaid', 'unshipped', 'untake', 'unevaluate', 'complete', 'refund', 'del');
     }
 
-    public function adminOrderNumber($orderType = -1)
+    public function adminOrderNumber($orderType = -1, $where = [])
     {
         $order_ids = input('order_ids', '');
-//        $where['order_type'] = $orderType;
+        //        $where['order_type'] = $orderType;
         //1: 未支付 2: 未发货 3: 待收货 4: 待评价 5: 交易完成 6: 已退款 7: 已删除
-        $all = $this->dao->search(['order_type' => $orderType], null)->when($order_ids, function ($q) use ($order_ids) {
+        $all = $this->dao->search(array_merge(['order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
         $statusAll = $all;
-        $unpaid = $this->dao->search(['paid' => 0, 'is_del' => 0, 'order_type' => $orderType], null)->when($order_ids, function ($q) use ($order_ids) {
+        $unpaid = $this->dao->search(array_merge(['paid' => 0, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $unshipped = $this->dao->search(['status' => 0, 'paid' => 1, 'is_del' => 0, 'order_type' => $orderType], null)->when($order_ids, function ($q) use ($order_ids) {
+        $unshipped = $this->dao->search(array_merge(['status' => 0, 'paid' => 1, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $untake = $this->dao->search(['status' => 1, 'is_del' => 0, 'order_type' => $orderType], null)->when($order_ids, function ($q) use ($order_ids) {
+        $untake = $this->dao->search(array_merge(['status' => 1, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $unevaluate = $this->dao->search(['status' => 2, 'is_del' => 0, 'order_type' => $orderType], null)->when($order_ids, function ($q) use ($order_ids) {
+        $unevaluate = $this->dao->search(array_merge(['status' => 2, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $complete = $this->dao->search(['status' => 3, 'is_del' => 0, 'order_type' => $orderType], null)->when($order_ids, function ($q) use ($order_ids) {
+        $complete = $this->dao->search(array_merge(['status' => 3, 'is_del' => 0, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $refund = $this->dao->search(['status' => -1, 'order_type' => $orderType], null)->when($order_ids, function ($q) use ($order_ids) {
+        $refund = $this->dao->search(array_merge(['status' => -1, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
-        $del = $this->dao->search(['is_del' => 1, 'order_type' => $orderType], null)->when($order_ids, function ($q) use ($order_ids) {
+        $del = $this->dao->search(array_merge(['is_del' => 1, 'order_type' => $orderType], $where), null)->when($order_ids, function ($q) use ($order_ids) {
             $q->whereIn('order_id', $order_ids);
         })->count();
 
@@ -5026,7 +5026,11 @@ class StoreOrderRepository extends BaseRepository
         $banclPay = $query->where($this->getOrderType($status))->where('test_order', 0)->where('paid', 1)->where('pay_type', 0)->field('sum(pay_price) as pay_price')->find();
         $wechatpay = $query->where($this->getOrderType($status))->where('test_order', 0)->where('paid', 1)->where('pay_type', '<>', 0)->field('sum(pay_price) as pay_price')->find();
 
+        $fzone_pay_price = 0.00;
+        $fzone_pay_vr = 0.00;
         foreach ($list as $key => $item) {
+            $fzone_pay_price = bcadd($fzone_pay_price, $item['fzone_pay_price'], 2);
+            $fzone_pay_vr = bcadd($fzone_pay_vr, $item['fzone_pay_vr'], 2);
             if ($item['fzone_paytype']) {
                 $list[$key]['fzone_paytype'] = json_decode($item['fzone_paytype'], true);
                 if (!count($list[$key]['fzone_paytype'])) {
@@ -5037,8 +5041,8 @@ class StoreOrderRepository extends BaseRepository
             }
         }
 
-        $list1[] = ['count' => 1753141, 'name' => '现金'];
-        $list1[] = ['count' => 159977, 'name' => 'VR'];
+        $list1[] = ['count' => $fzone_pay_price, 'name' => '现金'];
+        $list1[] = ['count' => $fzone_pay_vr, 'name' => 'VR'];
         $stat = [
             [
                 'className' => 'el-icon-s-goods',

app/controller/admin/order/Order.php

@@ -101,7 +101,8 @@ class Order extends BaseController
      */
     public function chart()
     {
-        return app('json')->success($this->repository->adminOrderNumber());
+        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids']);
+        return app('json')->success($this->repository->adminOrderNumber(-1, $where));
     }
 
     /**