From 9599280ff8c3027e2f1f70bc22b07c09b7a2b25c Mon Sep 17 00:00:00 2001
From: manghe <manghe@server>
Date: Sun, 23 Mar 2025 09:37:52 +0000
Subject: [PATCH] =?UTF-8?q?=E5=85=91=E6=8D=A2=E5=8F=98=E6=88=90=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/User.php      | 2 +-
 app/api/controller/Warehouse.php | 3 ++-
 app/common/model/User.php        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/User.php b/app/api/controller/User.php
index e690f5c..c087dc7 100755
--- a/app/api/controller/User.php
+++ b/app/api/controller/User.php
@@ -359,7 +359,7 @@ class User extends Base
         } elseif ($type == 2) {
             $whe[] = ['change_money', '<', 0];
         }
-        $data = ProfitScore::field('change_money,content,addtime')
+        $data = ProfitMoney2::field('change_money,content,addtime')
             ->withAttr('addtime', function ($value, $data) {
                 return date('Y-m-d H:i:s', (int) $data['addtime']);
             })
diff --git a/app/api/controller/Warehouse.php b/app/api/controller/Warehouse.php
index ca98d38..f8b3b5f 100755
--- a/app/api/controller/Warehouse.php
+++ b/app/api/controller/Warehouse.php
@@ -640,7 +640,8 @@ class Warehouse extends Base
         $total_money *= 100;
         if ($total_money > 0) {
             // $res[] = User::changeMoney($user_id, $total_money, 4, '兑换获得');
-            User::changeIntegral($user_id, $total_money, 4, '兑换获得');
+            // User::changeIntegral($user_id, $total_money, 4, '兑换获得');
+            User::changeMoney2($user_id, $total_money, 4, '兑换获得');
         }
         if (resCheck($res)) {
             Db::commit();
diff --git a/app/common/model/User.php b/app/common/model/User.php
index 508ac8c..2110119 100755
--- a/app/common/model/User.php
+++ b/app/common/model/User.php
@@ -135,7 +135,7 @@ class User extends Base
     }
 
     /**
-     * 用户市集余额变化
+     * 用户货币2变化
      * @param $user_id
      * @param $change_money
      * @param $type 1后台充值 2在线充值 3抽赏消费 4背包兑换 5推荐奖励