新增相关统计

app/common/repositories/finance/FinanceRepository.php

@@ -437,7 +437,6 @@ class FinanceRepository extends BaseRepository
             ->sum('extract_price');
         $data['statistics']['commission'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($user_extra_money), 'name' => '已提现金额'];
         $data['statistics'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($user_extra_money), 'name' => '已提现金额'];
-
         return $data;
     }
 
@@ -526,24 +525,24 @@ class FinanceRepository extends BaseRepository
         $date = [];
         //商户ID
         $query = Db::name('user_sign_score')
-            ->alias('uss')
-            ->leftJoin('user u', 'u.uid=uss.uid')
-            ->leftJoin('store_order o', 'o.order_id=uss.order_id')
-            ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
-                $query->where('uss.uid', $params['uid']);
-            })
-            ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
-                $query->where('uss.pm', $params['pm']);
-            })
-            ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
-                $query->where('uss.status', $params['status']);
-            })
-            ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
-                $query->whereLike('u.phone', '%' . $params['phone'] . '%');
-            })
-            ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
-                $query->where('type', $params['type']);
-            });
+        ->alias('uss')
+        ->leftJoin('user u', 'u.uid=uss.uid')
+        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
+        ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+            $query->where('uss.uid', $params['uid']);
+        })
+        ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
+            $query->where('uss.pm', $params['pm']);
+        })
+        ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
+            $query->where('uss.status', $params['status']);
+        })
+        ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+            $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+        })
+        ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
+            $query->where('type', $params['type']);
+        });
         $query1 = clone $query;
         $query2 = clone $query;
         $query3 = clone $query;
@@ -552,12 +551,12 @@ class FinanceRepository extends BaseRepository
         $query6 = clone $query;
         $query7 = clone $query;
         $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pm,uss.reward_socre,o.order_sn,uss.status,uss.mark,uss.desc,u.score')
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pm,uss.reward_socre,o.order_sn,uss.status,uss.mark,u.score')
             ->page($page, $limit)
             ->order('uss.id', 'desc')
             ->select()
             ->each(function ($item) {
-                $item['mark'] = $item['mark'].$item['desc'];
+                $item['mark'] = $item['mark'];
                 $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
                 return $item;
             });
@@ -572,6 +571,321 @@ class FinanceRepository extends BaseRepository
         return $date;
     }
 
+
+
+
+
+    /**
+     * 京豆统计
+     * @return mixed
+     */
+    public function jingdou_list($mer_id = 0)
+    {
+        $page = input('page');
+        $limit = input('limit');
+        $where = request()->params(['date']);
+        $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
+
+        $date = [];
+        //商户ID
+        $query = Db::name('user_sign_jingdou')
+        ->alias('uss')
+        ->leftJoin('user u', 'u.uid=uss.uid')
+        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
+        ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+            $query->where('uss.uid', $params['uid']);
+        })
+        // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
+        //     $query->where('uss.pm', $params['pm']);
+        // })
+        ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
+            $query->where('uss.status', $params['status']);
+        })
+        ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+            $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+        })
+        ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
+            $query->where('type', $params['type']);
+        });
+        $query1 = clone $query;
+        $query2 = clone $query;
+        $query3 = clone $query;
+        $query4 = clone $query;
+        $query5 = clone $query;
+        $query6 = clone $query;
+        $query7 = clone $query;
+        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
+            ->page($page, $limit)
+            ->order('uss.id', 'desc')
+            ->select()
+            ->each(function ($item) {
+                $item['mark'] = $item['mark'];
+                $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
+                return $item;
+            });
+        $date['count'] = $query->count();
+        $date['statistics']['all'] = decimal2($query1->sum('number'));
+        $date['statistics']['clear'] = decimal2($query2->where('uss.status', 1)->sum('number'));
+        $date['statistics']['nclear'] = decimal2($query3->where('uss.status', -1)->sum('number'));
+        $date['statistics']['lost'] = decimal2($query4->where('uss.status', 0)->sum('number'));
+ 
+        return $date;
+    }
+
+
+
+
+
+    /**
+     * 贡献值统计
+     * @return mixed
+     */
+    public function contribute_list($mer_id = 0)
+    {
+        $page = input('page');
+        $limit = input('limit');
+        $where = request()->params(['date']);
+        $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
+
+        $date = [];
+        //商户ID
+        $query = Db::name('user_sign_gongxian')
+        ->alias('uss')
+        ->leftJoin('user u', 'u.uid=uss.uid')
+        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
+        ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+            $query->where('uss.uid', $params['uid']);
+        })
+        // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
+        //     $query->where('uss.pm', $params['pm']);
+        // })
+        ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
+            $query->where('uss.status', $params['status']);
+        })
+        ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+            $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+        })
+        ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
+            $query->where('type', $params['type']);
+        });
+        $query1 = clone $query;
+        $query2 = clone $query;
+        $query3 = clone $query;
+        $query4 = clone $query;
+        $query5 = clone $query;
+        $query6 = clone $query;
+        $query7 = clone $query;
+        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
+            ->page($page, $limit)
+            ->order('uss.id', 'desc')
+            ->select()
+            ->each(function ($item) {
+                $item['mark'] = $item['mark'];
+                $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
+                return $item;
+            });
+        $date['count'] = $query->count();
+        $date['statistics']['all'] = decimal2($query1->sum('number'));
+        $date['statistics']['clear'] = decimal2($query2->where('uss.status', 1)->sum('number'));
+        $date['statistics']['nclear'] = decimal2($query3->where('uss.status', -1)->sum('number'));
+        $date['statistics']['lost'] = decimal2($query4->where('uss.status', 0)->sum('number'));
+ 
+        return $date;
+    }
+
+
+
+
+
+
+    /**
+     * 复购金统计
+     * @return mixed
+     */
+    public function fugou_list($mer_id = 0)
+    {
+        $page = input('page');
+        $limit = input('limit');
+        $where = request()->params(['date']);
+        $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
+
+        $date = [];
+        //商户ID
+        $query = Db::name('user_sign_fugou')
+        ->alias('uss')
+        ->leftJoin('user u', 'u.uid=uss.uid')
+        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
+        ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+            $query->where('uss.uid', $params['uid']);
+        })
+        // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
+        //     $query->where('uss.pm', $params['pm']);
+        // })
+        ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
+            $query->where('uss.status', $params['status']);
+        })
+        ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+            $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+        })
+        ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
+            $query->where('type', $params['type']);
+        });
+        $query1 = clone $query;
+        $query2 = clone $query;
+        $query3 = clone $query;
+        $query4 = clone $query;
+        $query5 = clone $query;
+        $query6 = clone $query;
+        $query7 = clone $query;
+        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
+            ->page($page, $limit)
+            ->order('uss.id', 'desc')
+            ->select()
+            ->each(function ($item) {
+                $item['mark'] = $item['mark'];
+                $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
+                return $item;
+            });
+        $date['count'] = $query->count();
+        $date['statistics']['all'] = decimal2($query1->sum('number'));
+        $date['statistics']['clear'] = decimal2($query2->where('uss.status', 1)->sum('number'));
+        $date['statistics']['nclear'] = decimal2($query3->where('uss.status', -1)->sum('number'));
+        $date['statistics']['lost'] = decimal2($query4->where('uss.status', 0)->sum('number'));
+ 
+        return $date;
+    }
+
+
+
+
+
+    /**
+     * 红包统计
+     * @return mixed
+     */
+    public function hongbao_list($mer_id = 0)
+    {
+        $page = input('page');
+        $limit = input('limit');
+        $where = request()->params(['date']);
+        $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
+
+        $date = [];
+        //商户ID
+        $query = Db::name('user_sign_hongbao')
+        ->alias('uss')
+        ->leftJoin('user u', 'u.uid=uss.uid')
+        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
+        ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+            $query->where('uss.uid', $params['uid']);
+        })
+        // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
+        //     $query->where('uss.pm', $params['pm']);
+        // })
+        ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
+            $query->where('uss.status', $params['status']);
+        })
+        ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+            $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+        })
+        ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
+            $query->where('type', $params['type']);
+        });
+        $query1 = clone $query;
+        $query2 = clone $query;
+        $query3 = clone $query;
+        $query4 = clone $query;
+        $query5 = clone $query;
+        $query6 = clone $query;
+        $query7 = clone $query;
+        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
+            ->page($page, $limit)
+            ->order('uss.id', 'desc')
+            ->select()
+            ->each(function ($item) {
+                $item['mark'] = $item['mark'];
+                $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
+                return $item;
+            });
+        $date['count'] = $query->count();
+        $date['statistics']['all'] = decimal2($query1->sum('number'));
+        $date['statistics']['clear'] = decimal2($query2->where('uss.status', 1)->sum('number'));
+        $date['statistics']['nclear'] = decimal2($query3->where('uss.status', -1)->sum('number'));
+        $date['statistics']['lost'] = decimal2($query4->where('uss.status', 0)->sum('number'));
+ 
+        return $date;
+    }
+
+
+
+
+
+
+    /**
+     * VR统计
+     * @return mixed
+     */
+    public function vr_list($mer_id = 0)
+    {
+        $page = input('page');
+        $limit = input('limit');
+        $where = request()->params(['date']);
+        $params = request()->params(['type', 'uid', 'pm', 'phone','status']);
+
+        $date = [];
+        //商户ID
+        $query = Db::name('user_sign_vr')
+        ->alias('uss')
+        ->leftJoin('user u', 'u.uid=uss.uid')
+        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
+        ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
+            $query->where('uss.uid', $params['uid']);
+        })
+        // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
+        //     $query->where('uss.pm', $params['pm']);
+        // })
+        // ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
+        //     $query->where('uss.status', $params['status']);
+        // })
+        ->when(isset($params['phone']) && $params['phone'] != '', function ($query) use ($params) {
+            $query->whereLike('u.phone', '%' . $params['phone'] . '%');
+        })
+        ->when(isset($params['type']) && $params['type'] != '', function ($query) use ($params) {
+            $query->where('type', $params['type']);
+        });
+        $query1 = clone $query;
+        $query2 = clone $query;
+        $query3 = clone $query;
+        $query4 = clone $query;
+        $query5 = clone $query;
+        $query6 = clone $query;
+        $query7 = clone $query;
+        $date['list'] = $this->date_where($query, $where['date'], 'uss,addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
+            ->page($page, $limit)
+            ->order('uss.id', 'desc')
+            ->select()
+            ->each(function ($item) {
+                $item['mark'] = $item['mark'];
+                $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
+                return $item;
+            });
+        $date['count'] = $query->count();
+        $date['statistics']['all'] = decimal2($query1->sum('number'));
+        $date['statistics']['clear'] = decimal2($query2->where('uss.type', 1)->sum('number'));
+        $date['statistics']['nclear'] = decimal2($query3->where('uss.type', 2)->sum('number'));
+ 
+        return $date;
+    }
+
+
+
+
+
     /**
      * 列表中的时间条件
      */

app/controller/admin/finance/Finance.php

@@ -41,11 +41,102 @@ class Finance extends BaseController
             $date = $financeRepository->integral_list();
             return app('json')->success($date);
         } catch (\Exception $e) {
-            Db::name('log')->insert(['data' => '佣金统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
-            return app('json')->fail('佣金统计失败');
+            Db::name('log')->insert(['data' => '积分统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('积分统计失败'.$e->getMessage());
+        }
+    }
+
+
+    /**
+     * 京豆统计
+     * @return mixed
+     */
+    public function jingdou_list(){
+        try {
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->jingdou_list();
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '京豆统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('京豆统计失败'.$e->getMessage());
+        }
+    }
+
+
+
+    /**
+     * 贡献值统计
+     * @return mixed
+     */
+    public function contribute_list(){
+        try {
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->contribute_list();
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '贡献值统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('贡献值统计失败'.$e->getMessage());
+        }
+    }
+
+
+
+
+    /**
+     * 复购金统计
+     * @return mixed
+     */
+    public function fugou_list(){
+        try {
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->fugou_list();
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '复购金统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('复购金统计失败'.$e->getMessage());
+        }
+    }
+
+
+
+
+    /**
+     * 红包统计
+     * @return mixed
+     */
+    public function hongbao_list(){
+        try {
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->hongbao_list();
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '红包统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('红包统计失败'.$e->getMessage());
         }
     }
 
+
+
+
+
+    /**
+     * VR统计
+     * @return mixed
+     */
+    public function vr_list(){
+        try {
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->vr_list();
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => 'VR统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('VR统计失败'.$e->getMessage());
+        }
+    }
+
+
+
+
     /**
      * 佣金统计
      * @return mixed

route/admin.php

@@ -825,6 +825,11 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('transaction_overview', '/transaction_overview');
             Route::get('user_bill', '/user_bill');
             Route::get('integral_list', '/integral_list');
+            Route::get('jingdou_list', '/jingdou_list');
+            Route::get('contribute_list', '/contribute_list');
+            Route::get('fugou_list', '/fugou_list');
+            Route::get('hongbao_list', '/hongbao_list');
+            Route::get('vr_list', '/vr_list');
             Route::get('day_bill/list', '/day_bill_list');
             Route::get('month_bill/list', '/month_bill_list');