日账单月账单详情页总价计算加上VR和复购金

app/controller/merchant/finance/PlatformIncomeDetail.php

@@ -122,12 +122,21 @@ class PlatformIncomeDetail extends BaseController
             $yongjin_out_all = $query5
                 ->where('deal_type', 2)
                 ->where('pm', 1)
-                ->sum('money');
+                ->sum('income_detail.money');
             // 订单入账总额
             $order_in_money = $query6
                 ->where('deal_type', 1)
                 ->where('pm', 1)
-                ->sum('money');
+                ->sum('income_detail.money');
+            $order_in_vr = $query6
+                ->where('deal_type', 1)
+                ->where('pm', 1)
+                ->sum('income_detail.vr');
+            $order_in_fg = $query6
+                ->where('deal_type', 1)
+                ->where('pm', 1)
+                ->sum('income_detail.fg');
+            $order_in_money += (double)bcadd($order_in_vr, $order_in_fg, 2);
             $platform_enter_all = $yongjin_out_all+$order_in_money;
 
             $return_data = compact( 'platform_enter_all', 'yongjin_out_all', 'list', 'count', 'order_in_money');