From 7361adeec694bf0c2fde6b139b6831601c784564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 13 Feb 2025 11:45:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?debug:=E7=89=88=E6=9C=AC=E5=8F=B7=E6=BC=8F?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
index d4f91863..80f8b1c3 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
@@ -1057,6 +1057,7 @@ public class DeviceServiceImpl implements DeviceService
         data.setOnlineStatus1(device.getOnlineStatus1());
         data.setOnlineStatus2(device.getOnlineStatus2());
         data.setLastOnlineTime(device.getLastOnlineTime());
+        data.setVersion(device.getVersion());
         return deviceMapper.updateSmDevice(data);
     }
 

From 8edf1c05fa0d458c96ec624549ac72e27bcf9de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Fri, 14 Feb 2025 10:54:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?debug:=E7=94=A8=E6=88=B7=E6=89=A3=E5=87=8F?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=88=A4=E6=96=ADcheck=E6=BC=8F=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java
index 49d5513b..12467ade 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java
@@ -261,7 +261,8 @@ public class UserServiceImpl implements UserService
 
         // 查询用户余额
         BigDecimal balance = smUserMapper.selectBalanceForUpdate(userId);
-        ServiceUtil.assertion(balance == null || balance.compareTo(amount) < 0, "减少ID为%s的用户余额%s元失败，请重试", userId, amount);
+        ServiceUtil.assertion(balance == null, "减少ID为%s的用户余额%s元失败，请重试", userId, amount);
+        ServiceUtil.assertion( check && balance.compareTo(amount) < 0 , "减少ID为%s的用户余额%s元失败，请重试", userId, amount);
 
         // 更新用户余额
         int update = smUserMapper.subtractBalance(userId, amount, check);