From 9eebfd8268ef1f12438e889ac9f296084ec17eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Wed, 7 Jan 2026 17:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=92=B1=E5=8C=85=E6=93=8D=E4=BD=9C=E6=96=B9=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82---=E5=90=8E=E5=8F=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/User.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/application/adminapi/controller/User.php b/application/adminapi/controller/User.php
index 9154c459..7dd6ba94 100644
--- a/application/adminapi/controller/User.php
+++ b/application/adminapi/controller/User.php
@@ -96,7 +96,7 @@ class User extends adminApi
             a.login_device,
             a.loginip,
             c.coin,
-            c.earnings,
+            d.earnings,
             b.is_real,
             a.init_code,
             a.status
@@ -110,18 +110,20 @@ class User extends adminApi
         if($order_type=='coin'){
             $order = "c.coin ".$order_type_val_str;
         }elseif($order_type=='earnings'){
-            $order = "c.earnings ".$order_type_val_str;
+            $order = "d.earnings ".$order_type_val_str;
         }
         $user_data = db::name('user')->alias('a')
             ->join('(SELECT * FROM fa_user_auth WHERE id IN (SELECT MAX(id) FROM fa_user_auth GROUP BY mobile)) b', 'a.mobile = b.mobile', 'LEFT')
-            ->join('user_wallet c', 'a.id = c.user_id','LEFT')
+            ->join('user_wallet_coin c', 'a.id = c.user_id','LEFT')
+            ->join('user_wallet_earnings d', 'a.id = d.user_id','LEFT')
             ->where($where)
             ->field($field)
             ->order($order);
         $lists = $user_data->page($page, $page_limit)->select();
         $count = db::name('user')->alias('a')
             ->join('(SELECT * FROM fa_user_auth WHERE id IN (SELECT MAX(id) FROM fa_user_auth GROUP BY mobile)) b', 'a.mobile = b.mobile', 'LEFT')
-            ->join('user_wallet c', 'a.id = c.user_id','LEFT')
+            ->join('user_wallet_coin c', 'a.id = c.user_id','LEFT')
+            ->join('user_wallet_earnings d', 'a.id = d.user_id','LEFT')
             ->where($where)
             ->field($field)
             ->count();
@@ -171,18 +173,20 @@ class User extends adminApi
         }
         $total_coin = db::name('user')->alias('a')
             ->join('(SELECT * FROM fa_user_auth WHERE id IN (SELECT MAX(id) FROM fa_user_auth GROUP BY mobile)) b', 'a.mobile = b.mobile', 'LEFT')
-            ->join('user_wallet c', 'a.id = c.user_id','LEFT')
+            ->join('user_wallet_coin c', 'a.id = c.user_id','LEFT')
+            ->join('user_wallet_earnings d', 'a.id = d.user_id','LEFT')
             ->where(['a.delete_time'=>0])
             ->where($where)
             ->field($field)
             ->sum('c.coin');
         $total_earnings = db::name('user')->alias('a')
             ->join('(SELECT * FROM fa_user_auth WHERE id IN (SELECT MAX(id) FROM fa_user_auth GROUP BY mobile)) b', 'a.mobile = b.mobile', 'LEFT')
-            ->join('user_wallet c', 'a.id = c.user_id','LEFT')
+            ->join('user_wallet_coin c', 'a.id = c.user_id','LEFT')
+            ->join('user_wallet_earnings d', 'a.id = d.user_id','LEFT')
             ->where(['a.delete_time'=>0])
             ->where($where)
             ->field($field)
-            ->sum('c.earnings');
+            ->sum('d.earnings');
         $return_data = [
             'page' =>$page,
             'page_limit' => $page_limit,