Wesmiler

app/Http/Controllers/Api/v1/AccountController.php

@@ -55,9 +55,8 @@ class AccountController extends webApp
     {
         $params = request()->post();
         $pageSize = request()->post('pageSize', 15);
-        $params['type'] = 2;
         $params['user_id'] = isset($params['user_id']) ? $params['user_id'] : $this->userId;
-        $datas = AccountService::make()->getDataList($params, $pageSize);
+        $datas = AccountService::make()->getPayLog($params, $pageSize);
         if ($datas) {
             return message(1010, true, $datas);
         } else {

app/Services/Api/AccountService.php

@@ -93,6 +93,38 @@ class AccountService extends BaseService
         ];
     }
 
+    /**
+     * 充值记录
+     * @param $params
+     * @param int $pageSize
+     * @return array
+     */
+    public function getPayLog($params, $pageSize = 15)
+    {
+        $userId = isset($params['user_id'])?$params['user_id'] : 0;
+        $list = PayOrdersModel::where(['user_id'=> $userId,'status'=>1,'mark'=>1])
+            ->select(['a.*'])
+            ->orderBy('a.create_time','desc')
+            ->orderBy('a.id','desc')
+            ->paginate($pageSize > 0 ? $pageSize : 9999999);
+        $list = $list? $list->toArray() :[];
+        if($list){
+            $types = [1=>'话费充值',2=>'电费充值',3=>'燃气充值'];
+            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($types[$type])? $types[$type] : '充值';
+            }
+        }
+
+        return [
+            'pageSize'=> $pageSize,
+            'total'=>isset($list['total'])? $list['total'] : 0,
+            'list'=> isset($list['data'])? $list['data'] : []
+        ];
+    }
+
     public function getQuery($params)
     {
         $where = ['a.mark' => 1];