Merge branch 'master' into dev

app/admin/service/statistics/OrderService.php

@@ -30,7 +30,8 @@ class OrderService
             ->where('pay_status', 'SUCCESS')
             ->where('pay_category', 'REFUND')
             ->sum('pay_amount');
-        $data['todayRevenue'] = $data['todayRevenue'] - $refundAmount;
+//        $data['todayRevenue'] = $data['todayRevenue'] - $refundAmount;
+        $data['todayRevenue'] = round($data['todayRevenue'],2);
         // 今日充值额
         $data['todayRecharge'] = Order::where('order_status_payment', 'SUCCESS')
             ->where('order_addtimes', '>', $todayTimeUnix)