From 4275d769eac4d55ee0898059275f66de5da560c4 Mon Sep 17 00:00:00 2001
From: Henry <t77131@sina.com>
Date: Tue, 13 Jul 2021 11:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=8E=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=99=E9=A2=9D=E5=92=8C=E7=A7=AF=E5=88=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=EF=BC=8C=E5=9B=A0=E7=B1=BB=E5=9E=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E5=AF=BC=E8=87=B4=E5=86=99=E5=85=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A0=E7=94=A8=E8=AE=B0=E5=BD=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/model/User.php | 7 +++----
 composer.json                    | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/admin/model/User.php b/application/admin/model/User.php
index 822c81b17..3f883d78a 100644
--- a/application/admin/model/User.php
+++ b/application/admin/model/User.php
@@ -47,12 +47,11 @@ class User extends Model
 
         self::beforeUpdate(function ($row) {
             $changedata = $row->getChangedData();
-            if (isset($changedata['money'])) {
-                $origin = $row->getOriginData();
+            $origin = $row->getOriginData();
+            if (isset($changedata['money']) && (function_exists('bccomp') ? bccomp($changedata['money'], $origin['money'], 2) !== 0 : (double) $changedata['money'] !== (double) $origin['money'])) {
                 MoneyLog::create(['user_id' => $row['id'], 'money' => $changedata['money'] - $origin['money'], 'before' => $origin['money'], 'after' => $changedata['money'], 'memo' => '管理员变更金额']);
             }
-            if (isset($changedata['score'])) {
-                $origin = $row->getOriginData();
+            if (isset($changedata['score']) && (int) $changedata['score'] !== (int) $origin['score']) {
                 ScoreLog::create(['user_id' => $row['id'], 'score' => $changedata['score'] - $origin['score'], 'before' => $origin['score'], 'after' => $changedata['score'], 'memo' => '管理员变更积分']);
             }
         });
diff --git a/composer.json b/composer.json
index b059b41ab..1de5563d2 100755
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,7 @@
         "ext-json": "*",
         "ext-curl": "*",
         "ext-pdo": "*",
+        "ext-bcmath": "*",
         "txthinking/mailer": "^2.0"
     },
     "config": {
-- 
Gitee