日账单月账单详情页拆分VR和复购金

app/controller/merchant/finance/PlatformIncomeDetail.php

@@ -136,10 +136,9 @@ class PlatformIncomeDetail extends BaseController
                 ->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;
+            $platform_enter_all = $yongjin_out_all+$order_in_money+$order_in_vr+$order_in_fg;
 
-            $return_data = compact( 'platform_enter_all', 'yongjin_out_all', 'list', 'count', 'order_in_money');
+            $return_data = compact( 'platform_enter_all', 'yongjin_out_all', 'list', 'count', 'order_in_money', 'order_in_vr', 'order_in_fg');
             return app('json')->success($return_data);
         } catch (\Exception $e) {
             Db::name('log')->insert(['data' => '获取平台收支明细错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);