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推荐奖励