商户新增统计

app/common/repositories/finance/FinanceRepository.php

@@ -1338,6 +1338,9 @@ class FinanceRepository extends BaseRepository
         // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
         //     $query->where('uss.pm', $params['pm']);
         // })
+        ->when(isset($mer_id) && $mer_id != '' && $mer_id != 0, function ($query) use ($mer_id) {
+            $query->where('uss.mer_id', $mer_id);
+        })
         ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
             $query->where('uss.status', $params['status']);
         })
@@ -1939,6 +1942,9 @@ class FinanceRepository extends BaseRepository
         ->leftJoin('user u', 'u.uid=uss.uid')
         ->leftJoin('store_order o', 'o.order_id=uss.order_id')
         ->leftJoin('merchant m', 'm.mer_id=o.mer_id')
+        ->when(isset($mer_id) && $mer_id != '' && $mer_id != 0, function ($query) use ($mer_id) {
+            $query->where('o.mer_id', $mer_id);
+        })
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
             $query->where('uss.uid', $params['uid']);
         })

app/controller/merchant/finance/Finance.php

@@ -282,4 +282,42 @@ class Finance extends BaseController
         }
     }
 
+
+    /**
+     * 京豆统计
+     * @return mixed
+     */
+    public function jingdou_list(){
+        try {
+            $mer_id = $this->request->merId();
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->jingdou_list($mer_id);
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '京豆统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('京豆统计失败');
+        }
+    }
+
+
+    /**
+     * 分润统计
+     * @return mixed
+     */
+    public function fenrun_list(){
+        try {
+            $mer_id = $this->request->merId();
+            $financeRepository = app()->make(FinanceRepository::class);
+            $date = $financeRepository->fenrun_list($mer_id);
+            return app('json')->success($date);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '分润统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('分润统计失败');
+        }
+    }
+
+
+
+
+
 }

route/merchant.php

@@ -536,6 +536,8 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
             Route::get('earnings_list', '/earnings_list');
             Route::get('earnings_detail', '/earnings_detail');
             Route::get('shop_partne_list', '/shop_partne_list');
+            Route::get('jingdou_list', '/jingdou_list');    
+            Route::get('fenrun_list', '/fenrun_list');
             //创客佣金
             Route::group('maker', function () {
                 Route::get('bill', '/maker_bill');