|
@@ -161,7 +161,7 @@ class TradeService extends BaseService
|
|
|
$list = $model->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
$list = $model->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
|
$list = $list ? $list->toArray() : [];
|
|
$list = $list ? $list->toArray() : [];
|
|
|
|
|
|
|
|
- $totalModdel->whereIn('a.status',[3,4]);
|
|
|
|
|
|
|
+// $totalModdel = $totalModdel->whereIn('a.status',[3,4]);
|
|
|
$counts = ['total' => 0, 'service_fee' => 0, 'bonus' => 0, 'fee' => 0];
|
|
$counts = ['total' => 0, 'service_fee' => 0, 'bonus' => 0, 'fee' => 0];
|
|
|
$total = $totalModdel->sum('a.real_price');
|
|
$total = $totalModdel->sum('a.real_price');
|
|
|
$counts['total'] = intval($total);
|
|
$counts['total'] = intval($total);
|
|
@@ -171,7 +171,7 @@ class TradeService extends BaseService
|
|
|
$counts['service_fee'] = intval($serviceFee);
|
|
$counts['service_fee'] = intval($serviceFee);
|
|
|
$fee = $totalModdel->sum('a.fee');
|
|
$fee = $totalModdel->sum('a.fee');
|
|
|
$counts['fee'] = intval($fee);
|
|
$counts['fee'] = intval($fee);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if ($list) {
|
|
if ($list) {
|
|
|
foreach ($list['data'] as &$item) {
|
|
foreach ($list['data'] as &$item) {
|
|
|
$item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
|
|
$item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
|
APPLE