|
|
@@ -156,14 +156,12 @@ class TradeService extends BaseService
|
|
|
->orderBy('a.create_time', 'desc')
|
|
|
->orderBy('a.id', 'desc');
|
|
|
|
|
|
- $totalModdel = $model;
|
|
|
-
|
|
|
- $list = $model->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
|
- $list = $list ? $list->toArray() : [];
|
|
|
-
|
|
|
-// $totalModdel = $totalModdel->whereIn('a.status',[3,4]);
|
|
|
+ // 统计
|
|
|
+ $totalModdel = clone $model;
|
|
|
+ $totalModdel = $totalModdel->whereIn('a.status',[3,4]);
|
|
|
$counts = ['total' => 0, 'service_fee' => 0, 'bonus' => 0, 'fee' => 0];
|
|
|
$total = $totalModdel->sum('a.real_price');
|
|
|
+
|
|
|
$counts['total'] = intval($total);
|
|
|
$bonus = $totalModdel->sum('a.bonus');
|
|
|
$counts['bonus'] = intval($bonus);
|
|
|
@@ -172,6 +170,11 @@ class TradeService extends BaseService
|
|
|
$fee = $totalModdel->sum('a.fee');
|
|
|
$counts['fee'] = intval($fee);
|
|
|
|
|
|
+ $list = $model->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
|
+ $list = $list ? $list->toArray() : [];
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if ($list) {
|
|
|
foreach ($list['data'] as &$item) {
|
|
|
$item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
|