Tree 5 цаг өмнө
parent
commit
64bf8e0493

+ 3 - 2
app/Http/Controllers/Admin/RechargeController.php

@@ -246,8 +246,8 @@ class RechargeController extends Controller
             ->where('o.pay_status', 9)
             ->selectRaw(
                 $operatorFilterActive
-                    ? 'sum(o.amount) as refund_amount,sum(ISNULL(o.refund_fee,0)) as refund_fee'
-                    : 'sum(amount) as refund_amount,sum(ISNULL(refund_fee,0)) as refund_fee'
+                    ? 'sum(o.amount) as refund_amount,sum(ISNULL(o.refund_fee,0)) as refund_fee,count(distinct o.id) as count_id'
+                    : 'sum(amount) as refund_amount,sum(ISNULL(refund_fee,0)) as refund_fee,count(id) as count_id'
             )
             ->first();
         $refundMoney = isset($refundSummary->refund_amount) ? number_float($refundSummary->refund_amount / NumConfig::NUM_VALUE) : 0;
@@ -391,6 +391,7 @@ class RechargeController extends Controller
                 'payTotalMoney' => $payTotalMoney,
                 'refundMoney' => $refundMoney,
                 'refundFee' => $refundFee,
+                'refundSummary' => $refundSummary,
                 'successUserRate' => $successUserRate,
                 'successOrderRate' => $successOrderRate,
                 'date' => $date,

+ 1 - 1
resources/views/admin/recharge/list.blade.php

@@ -211,7 +211,7 @@
                                         @endif
                                         <h4>{{ __('auto.总金额:') }}{{$totalMoney}} &nbsp;&nbsp; {{$payTotalMoney->count_u ?? 0}}{{ __('auto.人') }}&nbsp;&nbsp;{{$payTotalMoney->count_id ?? 0}}{{ __('auto.笔') }}</h4>
                                         <h4>{{ __('auto.已到账:') }}{{$overMoney}} &nbsp;&nbsp;{{$payOverMoney->count_u ?? 0}}{{ __('auto.人') }}&nbsp;&nbsp;{{$payOverMoney->count_id ?? 0}}{{ __('auto.笔') }}</h4>
-                                        <h4>退款金额:{{ $refundMoney ?? 0 }}</h4>
+                                        <h4>退款金额:{{ $refundMoney ?? 0 }} &nbsp;&nbsp;{{ $refundSummary->count_id ?? 0 }}{{ __('auto.笔') }}</h4>
                                         <h4>退款手续费:{{ $refundFee ?? 0 }}</h4>
                                         @if(!empty($viewAll))
                                             <h4>{{ __('auto.手续费汇总:') }}{{ $totalPaymentFee ?? 0 }}</h4>