Wesmiler

app/Services/Api/AccountService.php

@@ -65,24 +65,6 @@ class AccountService extends BaseService
             ->orderBy('a.id','desc')
             ->paginate($pageSize > 0 ? $pageSize : 9999999);
         $list = $list? $list->toArray() :[];
-        if($list){
-            $accountTypes = config('payment.accountTypes');
-            foreach($list['data'] as &$item){
-                $item['create_time'] = $item['create_time']? datetime($item['create_time'],'Y-m-d H:i:s') : '';
-                $item['time_text'] = $item['create_time']? dateFormat($item['create_time'],'Y年m月d日') : '';
-                $type = isset($item['type'])? intval($item['type']) : 0;
-                $item['type_text'] = isset($item['remark'])? trim($item['remark']) : '';
-                if(empty($item['type_text'])){
-                    $item['type_text'] = isset($accountTypes[$type])? $accountTypes[$type] : '收支明细';
-                }
-
-                $item['change_type'] = 1;
-                if(in_array($type,[1,2,4])){
-                    $item['change_type'] = 2;
-                }
-
-            }
-        }
 
         return [
             'pageSize'=> $pageSize,
@@ -116,6 +98,13 @@ class AccountService extends BaseService
                     $query->whereNotIn('a.status',[2]);
                 }
 
+                $changeType = isset($params['change_type'])? $params['change_type'] : 0;
+                if($changeType==1){
+                    $query->where('money','<', 0);
+                }else if($changeType==2){
+                    $query->where('money','>', 0);
+                }
+
                 if ($keyword) {
                     $query->where(function($query) use($keyword){
                         $query->where('b.nickname','like',"%{$keyword}%")