From 7466dcfdd7263049e4776d19f23d498d76b28913 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Thu, 16 Jan 2025 18:40:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E8=AE=A1=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/wfc/system/service/impl/SysDeviceServiceImpl.java    | 4 +++-
 .../java/org/wfc/user/service/impl/UAccountServiceImpl.java  | 5 +++--
 .../java/org/wfc/user/service/impl/UOrderServiceImpl.java    | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeviceServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeviceServiceImpl.java
index fd851e3..b3a153a 100644
--- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeviceServiceImpl.java
+++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeviceServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.wfc.common.redis.service.RedisService;
 import org.wfc.omada.api.device.OmadaDeviceApi;
 import org.wfc.omada.api.device.model.DeviceInfo;
@@ -53,7 +54,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
     private static final String REDIS_REFRESH_TOKEN = "wfc-api-omada:refresh-token";
     private static final int OMADA_ERROR_CODE = -44112;
 
-//    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public boolean deviceJob() {
         ResponseEntity<OperationResponseGridVoSiteSummaryInfo> siteList = omadaSiteApi.getSiteList(1, 1000);
         if (siteList.getBody() == null) {
@@ -63,6 +64,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         if (siteList.getBody().getErrorCode() == OMADA_ERROR_CODE) {
             redisService.deleteObject(REDIS_ACCESS_TOKEN);
             redisService.deleteObject(REDIS_REFRESH_TOKEN);
+            return false;
         }
         List<SiteSummaryInfo> sites = siteList.getBody().getResult().getData();
         for (SiteSummaryInfo site : sites) {
diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
index a3a5a9e..e6c7080 100644
--- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
+++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
@@ -108,9 +108,9 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
                         account.setBalance(BigDecimal.ZERO);
                     }
                     if (account.getBalance().compareTo(account.getBalanceUsed()) <= 0) {
-                        cancelUserIds.add(account.getUserId());
-                    } else {
+                        account.setBalanceUsed(BigDecimal.ZERO);
                         account.setBalance(BigDecimal.ZERO);
+                        cancelUserIds.add(account.getUserId());
                     }
                     this.updateById(account);
                 }
@@ -135,6 +135,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
                         account.setBalance(account.getBalance().subtract(bill.getAmount()));
                     } else {
                         account.setBalance(BigDecimal.ZERO);
+                        account.setBalanceUsed(BigDecimal.ZERO);
                         cancelUserIds.add(account.getUserId());
                     }
                     this.updateById(account);
diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java
index 74e503b..5788999 100644
--- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java
+++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java
@@ -101,6 +101,7 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
             account = new UAccount();
             account.setUserId(order.getUserId());
             account.setBalance(BigDecimal.ZERO);
+            account.setBalanceUsed(BigDecimal.ZERO);
         } else {
             accountId = account.getId();
             isValid = AccountUtil.isValid(account, new Date());