1

app/controller/api/user/UserFinance.php

@@ -91,7 +91,7 @@ class UserFinance extends ApiBaseController
         $pm = $this->request->param('pm', '');
         $start_time = $this->request->param('start_time', '');
         $end_time = $this->request->param('end_time', '');
-        $data = $this->billServices->getUserBillList($category, ['uid' => $this->request->uid(), 'pm' => $pm, 'start_time' => $start_time, 'end_time' => $end_time], '*');
+        $data = $this->billServices->getBillList($category, ['uid' => $this->request->uid(), 'pm' => $pm, 'start_time' => $start_time, 'end_time' => $end_time], '*');
         $all_income = $this->billServices->getUserBillSum($this->request->uid(), $category, '', 1);
         $all_expend = $this->billServices->getUserBillSum($this->request->uid(), $category, '', 0);
         $types = $this->billServices->getBillType($category);

app/services/user/UserBillServices.php

@@ -104,7 +104,7 @@ class UserBillServices extends BaseServices
      * @return array
      * @throws DbException
      */
-    public function getBillList(int $uid = 0, $category = 'integral', $where_time = [], string $field = '*')
+    public function getUserBillList(int $uid = 0, $category = 'integral', $where_time = [], string $field = '*')
     {
         [$page, $limit] = $this->getPageValue();
         $where = ['category' => $category];
@@ -127,7 +127,7 @@ class UserBillServices extends BaseServices
      * @return array
      * @throws \think\db\exception\DbException
      */
-    public function getUserBillList($category, array $where, string $field = '*', int $limit = 0)
+    public function getBillList($category, array $where, string $field = '*', int $limit = 0)
     {
         $where_data = ['category' => $category];
         if (isset($where['uid']) && $where['uid'] != '') {

app/services/user/UserServices.php

@@ -413,7 +413,7 @@ class UserServices extends BaseServices
                 $category = $where['category'] ?? 'integral';
                 $time = $where['time'] ?? [];
                 $services = app()->make(UserBillServices::class);
-                return $services->getBillList($id, $category, $time, 'title,category,number,balance,mark,add_time');
+                return $services->getUserBillList($id, $category, $time, 'title,category,number,balance,mark,add_time');
                 break;
             case 'balance_log':
                 /** @var UserMoneyServices $services */