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 siteList = omadaSiteApi.getSiteList(1, 1000); if (siteList.getBody() == null) { @@ -63,6 +64,7 @@ public class SysDeviceServiceImpl extends ServiceImpl 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 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 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 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());