财务统计模块确实条件的补足

app/Admin/Controllers/DataCenter/FinancialOrderChart.php

@@ -88,7 +88,9 @@ class FinancialOrderChart
     {
 
         //type 1默认选择当前月份 2根据时间+
-        $month >10??$month = '0'.$month;
+        if(intval($month) < 10){
+            $month  = '0'.$month;
+        }
 
         if($type == 1){
             //查找天
@@ -97,6 +99,7 @@ class FinancialOrderChart
                 ->selectRaw('DATE_FORMAT(created_at,"%m-%d") as day')
                 ->selectRaw('SUM(payment_amount) as sum')
                 ->where('payment_status',2)
+                ->where('is_faster',0)
                 ->where('created_at', '>=', $year.'-'.$month)
                 ->where('created_at', '<', $year.'-'.($month+1))
                 ->groupBy('day')
@@ -115,6 +118,7 @@ class FinancialOrderChart
                 ->selectRaw('DATE_FORMAT(created_at,"%Y") as day')
                 ->selectRaw('SUM(payment_amount) as sum')
                 ->where('payment_status',2)
+                ->where('is_faster',0)
                 ->where('created_at', '>', '2000-')
                 ->where('created_at', '<', '2099-')
                 ->groupBy('day')
@@ -130,7 +134,8 @@ class FinancialOrderChart
                 ->selectRaw('DATE_FORMAT(created_at,"%m-%d") as day')
                 ->selectRaw('SUM(payment_amount) as sum')
                 ->where('payment_status',2)
-                ->where('created_at', '>', $year.'-'.$month)
+                ->where('is_faster',0)
+                ->where('created_at', '>=', $year.'-'.$month)
                 ->where('created_at', '<', $year.'-'.($month+1))
                 ->groupBy('day')
                 ->orderBy('day')
@@ -147,6 +152,7 @@ class FinancialOrderChart
                 ->selectRaw('DATE_FORMAT(created_at,"%m") as day')
                 ->selectRaw('SUM(payment_amount) as sum')
                 ->where('payment_status',2)
+                ->where('is_faster',0)
                 ->where('created_at', '>=', $year.'-')
                 ->where('created_at', '<', ($year+1).'-')
                 ->groupBy('day')

app/Admin/Controllers/DataCenter/FinancialRechargeChart.php

@@ -87,7 +87,9 @@ class FinancialRechargeChart
     {
 
         //type 1默认选择当前月份 2根据时间+
-        $month >10??$month = '0'.$month;
+        if(intval($month) < 10){
+            $month  = '0'.$month;
+        }
 
         if($type == 1){
             //查找天
@@ -132,7 +134,7 @@ class FinancialRechargeChart
                 ->selectRaw('SUM(payment_amount) as sum')
                 ->where('product_type',7)
                 ->where('payment_status',2)
-                ->where('created_at', '>', $year.'-'.$month)
+                ->where('created_at', '>=', $year.'-'.$month)
                 ->where('created_at', '<', $year.'-'.($month+1))
                 ->groupBy('day')
                 ->orderBy('day')

app/Admin/Controllers/DataCenter/FinancialSta.php

@@ -16,7 +16,7 @@ class FinancialSta
 {
     //获取平台的收入总金额
     public static function getTotalIncome(){
-        $data = Order::where('payment_status',2)->pluck('payment_amount')->sum();
+        $data = Order::where('payment_status',2)->where('is_faster',0)->pluck('payment_amount')->sum();
         $data /=100;
        return $data;
     }
@@ -33,7 +33,7 @@ class FinancialSta
         return $data;
     }
     public static function getTotalRefund(){
-        $data = Order::where('payment_status',4)->pluck('payment_amount')->sum();
+        $data = Order::where('payment_status',4)->where('is_faster',0)->where('is_faster',0)->pluck('payment_amount')->sum();
         $data /= 100;
         return $data;
     }
@@ -70,6 +70,7 @@ class FinancialSta
     //获取今天的支付金额
     public static function getTodayPay(){
         $data = Order::where('payment_status',2)
+            ->where('is_faster',0)
             ->where('created_at','>=',date('Y-m-d 00:00:00',strtotime('today')))
             ->pluck('payment_amount')->sum();
         $data /= 100;
@@ -78,6 +79,7 @@ class FinancialSta
     //获取昨天的支付金额
     public static function getYesterdayPay(){
         $data = Order::where('payment_status',2)
+            ->where('is_faster',0)
             ->whereBetween('created_at',[date('Y-m-d 00:00:00',strtotime('-1 days')),date('Y-m-d 23:59:59',strtotime('-1 days'))])
             ->pluck('payment_amount')->sum();
         $data /= 100;
@@ -86,6 +88,7 @@ class FinancialSta
     //获取近七日的支付金额
     public static function getSevenDayPay(){
         $data = Order::where('payment_status',2)
+            ->where('is_faster',0)
             ->whereBetween('created_at',[date('Y-m-d 00:00:00',strtotime('-6 days')),date('Y-m-d H:i:s',time())])
             ->pluck('payment_amount')->sum();
         $data /= 100;
@@ -94,6 +97,7 @@ class FinancialSta
     //获取三十日的支付金额
     public static function getOneMonthPay(){
         $data = Order::where('payment_status',2)
+            ->where('is_faster',0)
             ->whereBetween('created_at',[date('Y-m-d 00:00:00',strtotime('-29 days')),date('Y-m-d H:i:s',time())])
             ->pluck('payment_amount')->sum();
         $data /= 100;