|
@@ -24,13 +24,9 @@ class Home extends Controller
|
|
|
$query = PaymentOrder::query();
|
|
$query = PaymentOrder::query();
|
|
|
$params['type'] = 2;
|
|
$params['type'] = 2;
|
|
|
$where = PaymentOrderService::getWhere($params);
|
|
$where = PaymentOrderService::getWhere($params);
|
|
|
-
|
|
|
|
|
- $totalAmount = (float)$query->where($where)
|
|
|
|
|
- ->whereDate('created_at', date('Y-m-d'))->sum('amount');
|
|
|
|
|
- $totalSuccess = (float)$query->where($where)->whereDate('created_at', date('Y-m-d'))
|
|
|
|
|
- ->whereIn('status', [1, 2])->sum('amount');
|
|
|
|
|
- $totalFail = (float)$query->where($where)->whereDate('created_at', date('Y-m-d'))
|
|
|
|
|
- ->where('status', 3)->sum('amount');
|
|
|
|
|
|
|
+ $totalAmount = (float)$query->where($where)->whereBetween('created_at', [$start, $end])->sum('amount');
|
|
|
|
|
+ $totalSuccess = (float)$query->where($where)->whereBetween('created_at', [$start, $end])->whereIn('status', [1, 2])->sum('amount');
|
|
|
|
|
+ $totalFail = (float)$query->where($where)->whereBetween('created_at', [$start, $end])->where('status', 3)->sum('amount');
|
|
|
$result = [
|
|
$result = [
|
|
|
'withdraw_rmb' => [
|
|
'withdraw_rmb' => [
|
|
|
'total_fail' => $totalFail,
|
|
'total_fail' => $totalFail,
|