WFC/be.wfc
2
0
Fork 0
Code Activity

fix: 修复流量账单

Browse Source
This commit is contained in:
caiyuchao
2025-01-16 20:40:09 +08:00
parent 7466dcfdd7
commit b57f4a7a77
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/wfc_user_db/wfc_user_db.sql
View File

@@ -657,7 +657,7 @@ CREATE TABLE `u_role` (
`role_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID', `role_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
`role_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色名称', `role_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色名称',
`role_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色权限字符串', `role_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色权限字符串',
`role_sort` int(11) NOT NULL COMMENT '显示顺序', `role_sort` int(11) NULL COMMENT '显示顺序',
`data_scope` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', `data_scope` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）',
`menu_check_strictly` tinyint(1) NULL DEFAULT 1 COMMENT '菜单树选择项是否关联显示', `menu_check_strictly` tinyint(1) NULL DEFAULT 1 COMMENT '菜单树选择项是否关联显示',
`dept_check_strictly` tinyint(1) NULL DEFAULT 1 COMMENT '部门树选择项是否关联显示', `dept_check_strictly` tinyint(1) NULL DEFAULT 1 COMMENT '部门树选择项是否关联显示',

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

@@ -111,6 +111,13 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
account.setBalanceUsed(BigDecimal.ZERO); account.setBalanceUsed(BigDecimal.ZERO);
account.setBalance(BigDecimal.ZERO); account.setBalance(BigDecimal.ZERO);
cancelUserIds.add(account.getUserId()); cancelUserIds.add(account.getUserId());
UBill bill = new UBill();
bill.setUserId(account.getUserId());
bill.setType(2);
bill.setStatus(1);
bill.setAmount(account.getBalanceUsed());
billMapper.insert(bill);
} }
this.updateById(account); this.updateById(account);
} }
@@ -120,6 +127,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
bill.setUserId(historyVo.getUserId()); bill.setUserId(historyVo.getUserId());
bill.setCdrHistoryId(historyVo.getId()); bill.setCdrHistoryId(historyVo.getId());
bill.setStatus(1); bill.setStatus(1);
bill.setType(2);
bill.setAmount(BillRuleUtil.calc(billRule, historyVo.getTrafficDown() + historyVo.getTrafficUp())); bill.setAmount(BillRuleUtil.calc(billRule, historyVo.getTrafficDown() + historyVo.getTrafficUp()));
billMapper.insert(bill); billMapper.insert(bill);
@@ -133,6 +141,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
} }
if (account.getBalance().compareTo(bill.getAmount()) > 0) { if (account.getBalance().compareTo(bill.getAmount()) > 0) {
account.setBalance(account.getBalance().subtract(bill.getAmount())); account.setBalance(account.getBalance().subtract(bill.getAmount()));
account.setBalanceUsed(BigDecimal.ZERO);
} else { } else {
account.setBalance(BigDecimal.ZERO); account.setBalance(BigDecimal.ZERO);
account.setBalanceUsed(BigDecimal.ZERO); account.setBalanceUsed(BigDecimal.ZERO);
@@ -249,6 +258,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
BigDecimal balance = Optional.ofNullable(dashboardVo.getBalance()).orElse(BigDecimal.ZERO); BigDecimal balance = Optional.ofNullable(dashboardVo.getBalance()).orElse(BigDecimal.ZERO);
if (balance.compareTo(balanceUsed) >= 0) { if (balance.compareTo(balanceUsed) >= 0) {
dashboardVo.setBalance(balance.subtract(balanceUsed)); dashboardVo.setBalance(balance.subtract(balanceUsed));
} else { } else {
dashboardVo.setBalance(BigDecimal.ZERO); dashboardVo.setBalance(BigDecimal.ZERO);
} }