WFC/be.wfc
2
0
Fork 0
Code Activity

fix: 修复流量计费

Browse Source
This commit is contained in:
caiyuchao
2025-01-16 18:40:52 +08:00
parent c8b3720947
commit 7466dcfdd7
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeviceServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.wfc.common.redis.service.RedisService; import org.wfc.common.redis.service.RedisService;
import org.wfc.omada.api.device.OmadaDeviceApi; import org.wfc.omada.api.device.OmadaDeviceApi;
import org.wfc.omada.api.device.model.DeviceInfo; 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 String REDIS_REFRESH_TOKEN = "wfc-api-omada:refresh-token";
private static final int OMADA_ERROR_CODE = -44112; private static final int OMADA_ERROR_CODE = -44112;
// @Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean deviceJob() { public boolean deviceJob() {
ResponseEntity<OperationResponseGridVoSiteSummaryInfo> siteList = omadaSiteApi.getSiteList(1, 1000); ResponseEntity<OperationResponseGridVoSiteSummaryInfo> siteList = omadaSiteApi.getSiteList(1, 1000);
if (siteList.getBody() == null) { if (siteList.getBody() == null) {
@@ -63,6 +64,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
if (siteList.getBody().getErrorCode() == OMADA_ERROR_CODE) { if (siteList.getBody().getErrorCode() == OMADA_ERROR_CODE) {
redisService.deleteObject(REDIS_ACCESS_TOKEN); redisService.deleteObject(REDIS_ACCESS_TOKEN);
redisService.deleteObject(REDIS_REFRESH_TOKEN); redisService.deleteObject(REDIS_REFRESH_TOKEN);
return false;
} }
List<SiteSummaryInfo> sites = siteList.getBody().getResult().getData(); List<SiteSummaryInfo> sites = siteList.getBody().getResult().getData();
for (SiteSummaryInfo site : sites) { for (SiteSummaryInfo site : sites) {

5
wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
View File

@@ -108,9 +108,9 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
account.setBalance(BigDecimal.ZERO); account.setBalance(BigDecimal.ZERO);
} }
if (account.getBalance().compareTo(account.getBalanceUsed()) <= 0) { if (account.getBalance().compareTo(account.getBalanceUsed()) <= 0) {
cancelUserIds.add(account.getUserId()); account.setBalanceUsed(BigDecimal.ZERO);
} else {
account.setBalance(BigDecimal.ZERO); account.setBalance(BigDecimal.ZERO);
cancelUserIds.add(account.getUserId());
} }
this.updateById(account); this.updateById(account);
} }
@@ -135,6 +135,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
account.setBalance(account.getBalance().subtract(bill.getAmount())); account.setBalance(account.getBalance().subtract(bill.getAmount()));
} else { } else {
account.setBalance(BigDecimal.ZERO); account.setBalance(BigDecimal.ZERO);
account.setBalanceUsed(BigDecimal.ZERO);
cancelUserIds.add(account.getUserId()); cancelUserIds.add(account.getUserId());
} }
this.updateById(account); this.updateById(account);

1
wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java
View File

@@ -101,6 +101,7 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
account = new UAccount(); account = new UAccount();
account.setUserId(order.getUserId()); account.setUserId(order.getUserId());
account.setBalance(BigDecimal.ZERO); account.setBalance(BigDecimal.ZERO);
account.setBalanceUsed(BigDecimal.ZERO);
} else { } else {
accountId = account.getId(); accountId = account.getId();
isValid = AccountUtil.isValid(account, new Date()); isValid = AccountUtil.isValid(account, new Date());