1

app/adminapi/controller/v1/finance/Finance.php

@@ -115,4 +115,24 @@ class Finance extends AuthController
         $where['uid'] = (int)$id;
         return app('json')->success($services->getBrokerageListNew($where));
     }
+
+    /**
+     * 获取佣金记录完整列表（包含user信息）
+     * @param UserBrokerageServices $services
+     * @return mixed
+     */
+    public function getBrokerageListFull(UserBrokerageServices $services)
+    {
+        $where = $this->request->getMore([
+            ['start_time', ''],
+            ['end_time', ''],
+            ['nickname', ''],
+            ['uid', ''],
+            ['pm', ''],
+            ['limit', 20],
+            ['page', 1]
+        ]);
+        return app('json')->success($services->getBrokerageListFull($where));
+    }
+
 }

app/adminapi/route/finance.php

@@ -42,6 +42,8 @@ Route::group('finance', function () {
         //佣金提现记录个人列表
 //        Route::get('finance/extract_list/:id', 'v1.finance.Finance/get_extract_list')->option(['real_name' => '佣金提现记录个人列表']);
         Route::get('finance/extract_list/:id', 'v1.finance.Finance/getUserBrokeragelist')->option(['real_name' => '佣金提现记录个人列表']);
+        //佣金记录完整列表（包含user信息）
+        Route::get('finance/brokerage_list_full', 'v1.finance.Finance/getBrokerageListFull')->option(['real_name' => '佣金记录完整列表']);
         /** 余额记录 */
         Route::get('balance/list', 'v1.finance.UserBalance/balanceList')->option(['real_name' => '余额记录列表']);
         Route::post('balance/set_mark/:id', 'v1.finance.UserBalance/balanceRecordRemark')->option(['real_name' => '余额记录备注']);

app/dao/user/UserBrokerageDao.php

@@ -134,4 +134,25 @@ class UserBrokerageDao extends BaseDao
     {
         return $this->search(['uid' => $uid, 'status' => 1, 'pm' => 1])->where('frozen_time', '>', time())->sum('number');
     }
+
+    /**
+     * 按时间获取佣金列表（完整版，包含user信息）
+     * @param array $where
+     * @param string $field
+     * @param int $page
+     * @param int $limit
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getBrokerageListByTime(array $where, string $field = '*', int $page = 0, int $limit = 0)
+    {
+        return $this->search($where)->field($field)->with([
+            'user' => function ($query) {
+                $query->field('uid,nickname,phone,avatar');
+            }])->when($page && $limit, function ($query) use ($page, $limit) {
+            $query->page($page, $limit);
+        })->order('add_time desc')->select()->toArray();
+    }
 }

app/services/user/UserBillServices.php

@@ -154,10 +154,10 @@ class UserBillServices extends BaseServices
             'pm' => 1
         ],
         'brokerage_to_nowMoney' => [
-            'title' => '佣金提现到余额',
+            'title' => '贡献值提现到余额',
             'category' => 'now_money',
             'type' => 'extract',
-            'mark' => '佣金提现到余额{%num%}元',
+            'mark' => '贡献值提现到余额{%num%}元',
             'status' => 1,
             'pm' => 0
         ],

app/services/user/UserBrokerageServices.php

@@ -93,16 +93,16 @@ class UserBrokerageServices extends BaseServices
             'pm' => 1
         ],
         'brokerage_to_nowMoney' => [
-            'title' => '佣金提现到余额',
+            'title' => '贡献值提现到余额',
             'type' => 'extract_money',
-            'mark' => '佣金提现到余额{%number%}元',
+            'mark' => '贡献值提现到余额{%number%}元，手续费{%fee%}元',
             'status' => 1,
             'pm' => 0
         ],
         'brokerage_transfer_fee' => [
-            'title' => '佣金转余额手续费',
+            'title' => '贡献值转余额手续费',
             'type' => 'brokerage_transfer_fee',
-            'mark' => '佣金转余额手续费{%number%}元',
+            'mark' => '贡献值转余额手续费{%number%}元',
             'status' => 1,
             'pm' => 0
         ],
@@ -158,7 +158,7 @@ class UserBrokerageServices extends BaseServices
         'brokerage_transfer_out' => [
             'title' => '贡献值互转转出',
             'type' => 'brokerage_transfer_out',
-            'mark' => '佣金互转给{%nickname%}(id:{%uid%})，金额{%number%}元',
+            'mark' => '佣金互转给{%nickname%}(id:{%uid%})，金额{%number%}元，手续费{%fee%}元',
             'status' => 1,
             'pm' => 0
         ],
@@ -170,9 +170,9 @@ class UserBrokerageServices extends BaseServices
             'pm' => 1
         ],
         'transfer_fee' => [
-            'title' => '佣金互转手续费',
+            'title' => '贡献值互转手续费',
             'type' => 'transfer_fee',
-            'mark' => '佣金互转手续费{%number%}元',
+            'mark' => '贡献值互转手续费{%number%}元',
             'status' => 1,
             'pm' => 0
         ],
@@ -539,6 +539,49 @@ class UserBrokerageServices extends BaseServices
         }
         return compact('data', 'count', 'sum');
     }
+
+    /**
+     * 获取佣金记录列表（完整版，包含user信息）
+     * @param array $where
+     * @param string $field
+     * @return array
+     */
+    public function getBrokerageListFull(array $where, string $field = '*')
+    {
+        $where_data = [];
+        if (isset($where['uid']) && $where['uid'] != '') {
+            $where_data['uid'] = $where['uid'];
+        }
+        if (isset($where['pm']) && $where['pm'] != '') {
+            $where_data['pm'] = $where['pm'];
+        }
+        if ($where['start_time'] != '' && $where['end_time'] != '') {
+            $where_data['time'] = str_replace('-', '/', $where['start_time']) . ' - ' . str_replace('-', '/', $where['end_time']);
+        }
+        if (isset($where['type']) && $where['type'] != '') {
+            $where_data['type'] = $where['type'];
+        }
+        if (isset($where['nickname']) && $where['nickname'] != '') {
+            $where_data['like'] = $where['nickname'];
+        }
+
+        [$page, $limit] = $this->getPageValue();
+
+        // 按时间从大到小排列
+        $data = $this->dao->getBrokerageListByTime($where_data, $field, $page, $limit);
+        $count = $this->dao->count($where_data);
+
+        foreach ($data as &$item) {
+            $item['nickname'] = $item['user']['nickname'] ?? '';
+            $item['phone'] = $item['user']['phone'] ?? '';
+            $item['avatar'] = $item['user']['avatar'] ?? '';
+            $item['_add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '';
+            unset($item['user']);
+        }
+
+        return compact('data', 'count');
+    }
+
     /**
      * 前端佣金排行页面数据
      * @param int $uid
@@ -629,7 +672,8 @@ class UserBrokerageServices extends BaseServices
             $this->income('brokerage_transfer_out', $uid, [
                 'nickname' => $toUser['nickname'],
                 'uid' => $toUid,
-                'number' => $money
+                'number' => $money,
+                'fee' => $transferFee
             ], $newFromBrokerage, $toUid);
 
             // 记录收款方收入记录
@@ -639,13 +683,6 @@ class UserBrokerageServices extends BaseServices
                 'number' => $actualAmount
             ], $newToBrokerage, $uid);
 
-            // 记录手续费
-            if ($transferFee > 0) {
-                $this->income('transfer_fee', $uid, [
-                    'number' => $transferFee
-                ], $newFromBrokerage, $toUid);
-            }
-
             return '转账成功';
         });
     }

app/services/user/UserMoneyServices.php

@@ -74,9 +74,9 @@ class UserMoneyServices extends BaseServices
             'pm' => 0
         ],
         'brokerage_to_nowMoney' => [
-            'title' => '佣金提现到余额',
+            'title' => '贡献值提现到余额',
             'type' => 'extract',
-            'mark' => '佣金提现到余额{%num%}元',
+            'mark' => '贡献值提现到余额{%num%}元',
             'status' => 1,
             'pm' => 1
         ],

app/services/user/UserRechargeServices.php

@@ -415,12 +415,8 @@ class UserRechargeServices extends BaseServices
         //佣金提现记录
         /** @var UserBrokerageServices $userBrokerageServices */
         $userBrokerageServices = app()->make(UserBrokerageServices::class);
-        $userBrokerageServices->income('brokerage_to_nowMoney', $uid, $price, $edit_data['brokerage_price'], $re['id']);
+        $userBrokerageServices->income('brokerage_to_nowMoney', $uid, ['number' => $price, 'fee' => $transferFee], $edit_data['brokerage_price'], $re['id']);
 
-        //佣金转余额手续费记录
-        if ($transferFee > 0) {
-            $userBrokerageServices->income('brokerage_transfer_fee', $uid, $transferFee, $edit_data['brokerage_price'], $re['id']);
-        }
         return true;
     }