Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/finance/FinanceRepository.php

@@ -555,6 +555,30 @@ class FinanceRepository extends BaseRepository
             ->whereBetween('settlement_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
             ->sum('pv');
 
+            $extract_count = Db::name('user_extract')
+            ->whereBetween('create_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
+            ->sum('extract_price');
+
+            $extract_wancheng_count = Db::name('user_extract')->where('status', 1)
+            ->whereBetween('create_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
+            ->sum('extract_price');
+
+            $extract_shenhezhong_count = Db::name('user_extract')->where('status', 0)
+            ->whereBetween('create_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
+            ->sum('extract_price');
+
+            $hehuo = Db::name('user_bill')->where('commission_type', 11)
+            ->whereBetween('create_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
+            ->sum('number');
+
+            $lianchuang = Db::name('user_bill')->where('commission_type', 12)
+            ->whereBetween('create_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
+            ->sum('number');
+
+            $guquan = Db::name('user_bill')->where('commission_type', 13)
+            ->whereBetween('create_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
+            ->sum('number');
+
         } else if ($type == 2 and $day != '') {
             $date = new \DateTime($day);
             $year = $date->format('Y');
@@ -645,6 +669,30 @@ class FinanceRepository extends BaseRepository
             ->whereBetween('settlement_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
             ->sum('pv');
 
+            $extract_count = Db::name('user_extract')
+            ->whereBetween('create_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
+            ->sum('extract_price');
+
+            $extract_wancheng_count = Db::name('user_extract')->where('status', 1)
+            ->whereBetween('create_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
+            ->sum('extract_price');
+
+            $extract_shenhezhong_count = Db::name('user_extract')->where('status', 0)
+            ->whereBetween('create_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
+            ->sum('extract_price');
+
+            $hehuo = Db::name('user_bill')->where('commission_type', 11)
+            ->whereBetween('create_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
+            ->sum('number');
+
+            $lianchuang = Db::name('user_bill')->where('commission_type', 12)
+            ->whereBetween('create_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
+            ->sum('number');
+
+            $guquan = Db::name('user_bill')->where('commission_type', 13)
+            ->whereBetween('create_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
+            ->sum('number');
+
         } else {
             $ruzhang = Db::name('enterprise_platform_income_detail')->where("deal_time <'" . date('Y-m-d H:i:s') . "'")
                 ->when($mer_id, function ($query) use ($mer_id) {
@@ -712,13 +760,33 @@ class FinanceRepository extends BaseRepository
 
             $pv = Db::name('user_pv_log')
             ->sum('pv');
+
+            $extract_count = Db::name('user_extract')
+            ->sum('extract_price');
+
+            $extract_wancheng_count = Db::name('user_extract')->where('status', 1)
+            ->sum('extract_price');
+
+            $extract_shenhezhong_count = Db::name('user_extract')->where('status', 0)
+            ->sum('extract_price');
+
+            $hehuo = Db::name('user_bill')->where('commission_type', 11)
+            ->sum('number');
+
+            $lianchuang = Db::name('user_bill')->where('commission_type', 12)
+            ->sum('number');
+
+            $guquan = Db::name('user_bill')->where('commission_type', 13)
+            ->sum('number');
         }
 
 
         $yingyemoney = Db::name('store_order')->where($where)->sum('pay_price');
         $hf_fee_amt = Db::name('store_order')->where($where_order)->sum('hf_fee_amt');//汇付手续费
 
-        return compact('yingyemoney', 'hf_fee_amt', 'my_money', 'tixinan', 'ruzhang', 'shouyi', 'jieyu', 'integral', 'yanglao', 'gongxian', 'jingdou', 'hongbao', 'fugou', 'vr', 'suoke', 'pv');
+        return compact('yingyemoney', 'hf_fee_amt', 'my_money', 'tixinan', 'ruzhang', 'shouyi', 'jieyu', 
+        'integral', 'yanglao', 'gongxian', 'jingdou', 'hongbao', 'fugou', 'vr', 'suoke', 'pv', 'extract_count', 'extract_wancheng_count', 'extract_shenhezhong_count', 
+        'hehuo', 'lianchuang', 'guquan');
     }
 
     /**

app/controller/admin/finance/Finance.php

@@ -117,16 +117,17 @@ class Finance extends BaseController
 
             //底部大模块
             $list1 = array(
-                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '已完成提现总额'),
-                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '审核中总额'),
+                array('className' => 'el-icon-s-goods', 'count' => $arr['extract_wancheng_count'], 'name' => '已完成提现总额'),
+                array('className' => 'el-icon-s-goods', 'count' => $arr['extract_shenhezhong_count'], 'name' => '审核中总额'),
             );
             $list2 = array(
-                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '合伙分红总额'),
-                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '联创分红总额'),
-                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '股权分红总额'),
+                array('className' => 'el-icon-s-goods', 'count' => $arr['hehuo'], 'name' => '合伙分红总额'),
+                array('className' => 'el-icon-s-goods', 'count' => $arr['lianchuang'], 'name' => '联创分红总额'),
+                array('className' => 'el-icon-s-goods', 'count' => $arr['guquan'], 'name' => '股权分红总额'),
             );
-            $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '提现总额', 'list' => $list1];
-            $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '分红总额', 'list' => $list2];
+            $fenhong = bcadd($arr['hehuo'],bcadd($arr['lianchuang'],$arr['guquan'],2),2);
+            $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => bcadd($arr['extract_wancheng_count'],$arr['extract_shenhezhong_count'],2), 'name' => '提现总额', 'list' => $list1];
+            $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => $fenhong, 'name' => '分红总额', 'list' => $list2];
             
             return app('json')->success('ok', $res);
         } catch (\Exception $e) {