供应商和租赁账户首页不合理,帮我重新设计,应该是包含各自角色相关的统计图表信息,和监控状态信息。

This commit is contained in:
lu7213 committed 2026-10-26 00:36:07 -04:00
1 parent 8dcb313454
commit 02dd5668d5
7 files changed
+383

No files matched your search

+2
View File
@@ -1,5 +1,7 @@
# 租赁模块三端实现与运行说明
供应商/租赁账户首页现为统计图表与运行监控看板,不嵌入业务操作菜单;接口、指标口径和可选索引升级见[角色统计看板](role-dashboard.md)。
用户套餐绑定增量:核心表新增 rent_user_package,管理员授权具体套餐版本;应用按 user_id 选择已绑定套餐,省略 package_id 自动选择默认。部署前执行增量表SQL并配置用户绑定,见 [用户套餐绑定与脚本](user-package-bindings.md)。历史订单和在途处理不受绑定变更影响。
本文对应当前工作区的 V2.2 实现。设计依据仍为 [schema-design.md](schema-design.md) 和 [rent_init.sql](../../sql/rent_init.sql)。代码交付不等于生产迁移或真实链上验收;本次没有修改现有数据库,没有执行任何真实广播。
+48
View File
@@ -0,0 +1,48 @@
# 供应商与租赁账户首页看板
两个角色首页只展示统计、图表和监控,不再嵌入节点/套餐操作列表,不新增内部菜单。业务管理统一使用框架菜单。供应商使用绿色点缀,租赁账户使用蓝色点缀;窄屏自动单列布局,图表跟随框架侧栏和窗口尺寸变化。
## 查询与隔离
`GET /rental/dashboard/{persona}?network=NILE&days=14`,persona仅允许supplier/account;days仅支持7、14、30,network仅支持NILE/MAINNET。复用rent:portal:view权限,不需要新增菜单授权。user_id始终来自当前登录会话,客户端不能指定他人身份;管理员也仅展示本人数据。persona仅切换本人供应/租赁视角,不授予操作权限。
服务使用只读REPEATABLE_READ事务聚合,不调用TRON、不创建账户、不调整业务状态。图表统计全部匹配记录,不使用通用列表的50条分页结果。没有业务数据时展示0和空图,没有订单时成功率展示“—”;未开户显示“未开通”,不会自动开户。
## 时间与网络
统计窗口为UTC今天及此前days-1天,截止本次查询时刻。前端明确标注UTC,日期零补齐。网络筛选隔离订单、账本、余额、钱包、任务及回调;应用和节点本身没有network字段,按本人跨网络展示并明确标注。
“核心区间订单/状态分布/订单趋势/资源租赁量”按订单创建日及当前状态聚合,因此历史订单核验后曲线可能变化。“净应收/净消费”按实际账本记账日统计,与订单创建日口径不同。余额、监控、最近订单均为当前状态,不受日期筛选限制;最近订单最多6条,节点健康最多8条且离线优先。
## 供应商
| 区域 | 口径 |
| --- | --- |
| 区间履约订单 | supplier_user_id等于当前登录用户,所选网络的已分配订单 |
| 区间成功率 | 当前SUCCESS数量/区间全部订单,含处理中/失败/取消的分母 |
| 净应收及趋势 | 本人所选网络账本SUPPLIER_EARN、SUPPLIER_FEE、REVERSAL的delta_supplier_pending合计,扣手续费及冲正,不把SETTLE转出当收入 |
| 待结算及余额 | 当前rent_account余额快照,与区间净应收不同 |
| 在线节点 | connection_status=ONLINE且heartbeat_expires_at晚于查询时刻;在线与审核/接单状态分别展示 |
| 有效快照资源 | 所选网络、ACTIVE且已验证钱包、快照未过期、快照区块不低于最小屏障,按资源启用开关分别汇总max(0,available) |
| 资源监控 | 非有效快照钱包、UNKNOWN任务、SUCCESS到期未DONE回收、履约或回收MANUAL_REVIEW订单 |
| 结算处理中 | PENDING、APPROVED、PAYING、UNKNOWN结算单数量 |
有效快照资源包含节点可能已离线的钱包,表示可信投影中的资源,不等于当前可调度容量;最终执行仍检查心跳、资源保留、额度和链上状态。能量Energy与带宽bytes绝不相加。
## 租赁账户
订单仅沿rent_order.app_id→rent_app.user_id归属查询,不与同用户供应商订单混合。净消费为CHARGE的-delta_frozen减REFUND的delta_available,不包含HOLD/RELEASE;退款来自早期订单时本期净消费可能为负。金额统一BigDecimal,响应返回6位十进制字符串,卡片按字符串展示;图表坐标使用近似数值,不用于账务计算。
当前租赁中为SUCCESS且服务未到期、回收未DONE;处理中为WAITING/EXECUTING/VERIFYING。人工核对包含履约或回收MANUAL_REVIEW。回调沿本人应用订单归属,DEAD为重试耗尽,PENDING/SENDING为待确认。应用启用状态、有效APP凭证数量、当前套餐网络和上架状态均单独展示,绝不返回Secret或签名。套餐绑定属于另一个网络时提示网络不匹配,不冒充可用套餐。
## 刷新与部署
默认每30秒刷新,可关闭并手动刷新。隐藏页面或离开缓存标签时暂停轮询,重新显示时刷新;网络/天数/角色切换使旧响应失效,防止串图。刷新失败保留上次成功数据及其更新时间,并展示错误提示;切换筛选失败不显示旧筛选数据。
不需要新增业务表或修改字段。全量初始化SQL已包含供应商订单、账户记账日期的索引;旧库可在维护窗口执行`sql/rent_dashboard_indexes.sql`增加两个只读看板索引,脚本可重复执行。未自动执行生产数据库DDL。
## 验证记录
JDK8下68项租赁测试通过,新增看板用例覆盖用户/角色/网络隔离、全量聚合、日期补齐、账务口径、心跳有效期、过期快照、资源非负、跨期退款负消费及历史监控告警。前端ESLint、Vue模板/CSS解析及staging完整构建通过,原有无关模块导出与包体积警告保留。
当前组件使用合成数据在Chrome渲染,供应商与租赁账户1440px桌面、租赁账户390px移动视口均通过三图渲染和无横向溢出检查,已人工查看预览;这不等同实际账号/数据库联调。未执行项目数据库DDL、RPC或真实广播。
@@ -0,0 +1,182 @@
package com.ruoyi.system.rental;
import static com.ruoyi.system.rental.RentalValues.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
/**
* 本人租赁看板的只读聚合。禁止通过通用列表截取50行后在前端统计;
* 每项查询均在数据库中完成归属及网络过滤,不触发RPC、创建账户或修改业务状态。
*/
@Service
public class RentalDashboard {
private final RentalStore store;
public RentalDashboard(RentalStore store) {
this.store = store;
}
/** 同一事务快照保证本次余额、图表、监控口径一致;所有时间为UTC。 */
@Transactional(readOnly = true, isolation = Isolation.REPEATABLE_READ)
public Map<String, Object> overview(long user, String persona, String selectedNetwork, int days) {
require(user > 0 && Arrays.asList("supplier", "account").contains(persona), "看板身份不合法");
require(days == 7 || days == 14 || days == 30, "仅支持近7、14、30天");
String network = network(selectedNetwork);
boolean supplier = "supplier".equals(persona);
LocalDateTime timestamp = now();
LocalDateTime start = timestamp.toLocalDate().minusDays(days - 1).atStartOfDay();
// 本人既是供应商又是租赁用户时,两种订单视角必须分开,不能使用OR合并。
String owned = supplier ? "o.supplier_user_id=?"
: "EXISTS(SELECT 1 FROM rent_app a WHERE a.id=o.app_id AND a.user_id=?)";
String scope = " FROM rent_order o WHERE " + owned + " AND o.network=?";
Map<String, Object> orders = store.one("SELECT COUNT(*) AS total,"
+ " COALESCE(SUM(CASE WHEN status='SUCCESS' THEN 1 ELSE 0 END),0) AS success,"
+ " COALESCE(SUM(CASE WHEN status='FAILED' THEN 1 ELSE 0 END),0) AS failed,"
+ " COALESCE(SUM(CASE WHEN status='SUCCESS' AND resource_type='ENERGY' THEN resource_quantity ELSE 0 END),0) AS energy,"
+ " COALESCE(SUM(CASE WHEN status='SUCCESS' AND resource_type='BANDWIDTH' THEN resource_quantity ELSE 0 END),0) AS bandwidth"
+ scope + " AND o.created_at>=? AND o.created_at<=?", user, network, start, timestamp);
Map<String, Object> monitoring = store.one("SELECT"
+ " COALESCE(SUM(CASE WHEN status IN ('WAITING','EXECUTING','VERIFYING') THEN 1 ELSE 0 END),0) AS processing,"
+ " COALESCE(SUM(CASE WHEN status='MANUAL_REVIEW' OR reclaim_status='MANUAL_REVIEW' THEN 1 ELSE 0 END),0) AS manual,"
+ " COALESCE(SUM(CASE WHEN status='SUCCESS' AND service_expires_at>? AND reclaim_status<>'DONE' THEN 1 ELSE 0 END),0) AS active_leases,"
+ " COALESCE(SUM(CASE WHEN status='SUCCESS' AND service_expires_at<=? AND reclaim_status<>'DONE' THEN 1 ELSE 0 END),0) AS reclaim_pending"
+ scope, timestamp, timestamp, user, network);
Map<String, Object> account = store.one("SELECT status,available_amount,frozen_amount,supplier_pending_amount"
+ " FROM rent_account WHERE user_id=? AND network=?", user, network);
Map<String, Object> balance = map("status", account == null ? "NOT_OPEN" : account.get("status"),
"available", decimal(account, "available_amount"), "frozen", decimal(account, "frozen_amount"));
if (supplier) {
balance.put("pending", decimal(account, "supplier_pending_amount"));
}
// 按实际记账时间统计,冻结/解冻不算消费,结算转出不算收入。
String moneyExpression = supplier
? "CASE WHEN l.event_type IN ('SUPPLIER_EARN','SUPPLIER_FEE','REVERSAL') THEN l.delta_supplier_pending ELSE 0 END"
: "CASE WHEN l.event_type='CHARGE' THEN -l.delta_frozen WHEN l.event_type='REFUND' THEN -l.delta_available ELSE 0 END";
String ledger = " FROM rent_ledger l JOIN rent_account a ON a.id=l.account_id"
+ " WHERE a.user_id=? AND a.network=? AND l.created_at>=? AND l.created_at<=?";
Map<String, Object> money = store.one("SELECT COALESCE(SUM(" + moneyExpression + "),0) AS amount"
+ ledger, user, network, start, timestamp);
orders.put("amount", decimal(money, "amount"));
List<Map<String, Object>> distribution = store.rows("SELECT status,COUNT(*) AS total" + scope
+ " AND o.created_at>=? AND o.created_at<=? GROUP BY status ORDER BY status",
user, network, start, timestamp);
List<Map<String, Object>> dailyOrders = store.rows("SELECT CAST(o.created_at AS DATE) AS day,COUNT(*) AS total,"
+ " SUM(CASE WHEN status='SUCCESS' THEN 1 ELSE 0 END) AS success" + scope
+ " AND o.created_at>=? AND o.created_at<=? GROUP BY CAST(o.created_at AS DATE)",
user, network, start, timestamp);
List<Map<String, Object>> dailyMoney = store.rows("SELECT CAST(l.created_at AS DATE) AS day,"
+ " SUM(" + moneyExpression + ") AS amount" + ledger + " GROUP BY CAST(l.created_at AS DATE)",
user, network, start, timestamp);
Map<String, Map<String, Object>> calendar = new LinkedHashMap<>();
for (int index = 0; index < days; index++) {
String day = start.toLocalDate().plusDays(index).toString();
calendar.put(day, map("day", day, "total", 0L, "success", 0L, "amount", "0.000000"));
}
for (Map<String, Object> row : dailyOrders) {
Map<String, Object> day = calendar.get(text(row, "day"));
if (day != null) {
day.put("total", row.get("total"));
day.put("success", row.get("success"));
}
}
for (Map<String, Object> row : dailyMoney) {
Map<String, Object> day = calendar.get(text(row, "day"));
if (day != null) {
day.put("amount", decimal(row, "amount"));
}
}
List<Map<String, Object>> recent = store.rows("SELECT o.order_no,o.resource_type,o.resource_quantity,"
+ "o.status,o.reclaim_status,o.created_at,o.service_expires_at" + scope
+ " ORDER BY o.created_at DESC,o.id DESC LIMIT 6", user, network);
timestamps(recent, "created_at", "service_expires_at");
Map<String, Object> result = map("persona", persona, "network", network, "days", days,
"generated_at", timestamp.toInstant(java.time.ZoneOffset.UTC).toEpochMilli(), "timezone", "UTC",
"orders", orders, "monitoring", monitoring, "balance", balance, "distribution", distribution,
"trend", new ArrayList<>(calendar.values()), "recent_orders", recent);
if (supplier) {
supplier(result, user, network, timestamp);
} else {
account(result, user, network, timestamp);
}
return result;
}
private void supplier(Map<String, Object> result, long user, String network, LocalDateTime timestamp) {
String online = "connection_status='ONLINE' AND heartbeat_expires_at>?";
result.put("nodes", store.one("SELECT COUNT(*) AS total,"
+ " COALESCE(SUM(CASE WHEN " + online + " THEN 1 ELSE 0 END),0) AS online,"
+ " COALESCE(SUM(CASE WHEN status='ACTIVE' AND " + online + " THEN 1 ELSE 0 END),0) AS active_online,"
+ " COALESCE(SUM(CASE WHEN status='PENDING' THEN 1 ELSE 0 END),0) AS pending"
+ " FROM rent_node WHERE user_id=?", timestamp, timestamp, user));
// 可用量仅展示有效且已核验的钱包投影,不推断实际链上可调度量。
String fresh = "w.status='ACTIVE' AND w.ownership_verified_at IS NOT NULL"
+ " AND w.snapshot_expires_at>? AND w.snapshot_block_height>=w.snapshot_min_block_height";
result.put("wallets", store.one("SELECT COUNT(*) AS total,"
+ " COALESCE(SUM(CASE WHEN " + fresh + " THEN 1 ELSE 0 END),0) AS fresh,"
+ " COALESCE(SUM(CASE WHEN " + fresh + " AND w.energy_enabled=1 THEN GREATEST(0,w.energy_available) ELSE 0 END),0) AS energy,"
+ " COALESCE(SUM(CASE WHEN " + fresh + " AND w.bandwidth_enabled=1 THEN GREATEST(0,w.bandwidth_available) ELSE 0 END),0) AS bandwidth"
+ " FROM rent_wallet w JOIN rent_node n ON n.id=w.node_id WHERE n.user_id=? AND w.network=?",
timestamp, timestamp, timestamp, user, network));
List<Map<String, Object>> nodes = store.rows("SELECT n.node_no,n.name,n.status,n.connection_status,"
+ "n.heartbeat_at,n.heartbeat_expires_at,n.agent_version FROM rent_node n WHERE n.user_id=?"
+ " ORDER BY CASE WHEN n.connection_status='ONLINE' AND n.heartbeat_expires_at>? THEN 1 ELSE 0 END,"
+ "n.heartbeat_at DESC,n.id DESC LIMIT 8", user, timestamp);
for (Map<String, Object> node : nodes) {
boolean live = "ONLINE".equals(text(node, "connection_status"))
&& node.get("heartbeat_expires_at") != null
&& time(node.get("heartbeat_expires_at")).isAfter(timestamp.toInstant(java.time.ZoneOffset.UTC));
node.put("online", live);
}
timestamps(nodes, "heartbeat_at", "heartbeat_expires_at");
result.put("node_status", nodes);
result.put("tasks", store.rows("SELECT t.status,COUNT(*) AS total FROM rent_task t"
+ " JOIN rent_node n ON n.id=t.node_id WHERE n.user_id=? AND t.network=?"
+ " AND t.status IN ('PENDING','ACCEPTED','BROADCASTED','UNKNOWN') GROUP BY t.status",
user, network));
result.put("settlements", store.one("SELECT COUNT(*) AS pending FROM rent_settlement s"
+ " JOIN rent_account a ON a.id=s.account_id WHERE a.user_id=? AND a.network=?"
+ " AND s.status IN ('PENDING','APPROVED','PAYING','UNKNOWN')", user, network));
}
private void account(Map<String, Object> result, long user, String network, LocalDateTime timestamp) {
result.put("apps", store.one("SELECT COUNT(*) AS total,"
+ " COALESCE(SUM(CASE WHEN status='ACTIVE' THEN 1 ELSE 0 END),0) AS active"
+ " FROM rent_app WHERE user_id=?", user));
result.put("credentials", store.one("SELECT COUNT(*) AS active FROM rent_credential c"
+ " JOIN rent_app a ON a.id=c.owner_id WHERE c.owner_type='APP' AND a.user_id=?"
+ " AND a.status='ACTIVE' AND c.status='ACTIVE' AND (c.expires_at IS NULL OR c.expires_at>?)",
user, timestamp));
result.put("webhooks", store.rows("SELECT h.status,COUNT(*) AS total FROM rent_webhook h"
+ " JOIN rent_order o ON o.id=h.order_id JOIN rent_app a ON a.id=o.app_id"
+ " WHERE a.user_id=? AND o.network=? GROUP BY h.status", user, network));
result.put("package", store.one("SELECT p.name,p.network,p.resource_type,p.resource_quantity,"
+ "p.status,p.duration_seconds FROM rent_user_package b JOIN rent_package p ON p.id=b.package_id"
+ " WHERE b.user_id=? AND b.status='ACTIVE' AND b.default_slot=1", user));
result.put("refunds", store.one("SELECT COUNT(*) AS pending FROM rent_refund r"
+ " JOIN rent_order o ON o.id=r.order_id JOIN rent_app a ON a.id=o.app_id"
+ " WHERE a.user_id=? AND o.network=? AND r.status='PENDING'", user, network));
}
/** 金额返回精确十进制字符串,浏览器仅在图形坐标上做近似映射。 */
private String decimal(Map<String, Object> row, String key) {
return (row == null || row.get(key) == null ? BigDecimal.ZERO : new BigDecimal(text(row, key)))
.setScale(6).toPlainString();
}
private void timestamps(List<Map<String, Object>> rows, String... fields) {
for (Map<String, Object> row : rows) {
for (String field : fields) {
if (row.get(field) != null) {
row.put(field, time(row.get(field)).toEpochMilli());
}
}
}
}
}
@@ -0,0 +1,28 @@
package com.ruoyi.system.rental;
import static com.ruoyi.system.rental.RentalValues.require;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
/** 角色看板仅查询当前登录用户;不接受客户端user_id,不提供全平台聚合旁路。 */
@RestController
@RequestMapping("/rental/dashboard")
public class RentalDashboardController {
private final RentalDashboard dashboard;
public RentalDashboardController(RentalDashboard dashboard) {
this.dashboard = dashboard;
}
@GetMapping("/{persona}")
@PreAuthorize("@ss.hasPermi('rent:portal:view')")
public AjaxResult overview(@PathVariable String persona,
@RequestParam(defaultValue = "NILE") String network,
@RequestParam(defaultValue = "14") int days) {
Long user = SecurityUtils.getUserId();
require(user != null, "请先登录");
return AjaxResult.success(dashboard.overview(user, persona, network, days));
}
}
@@ -506,6 +506,108 @@ public class RentalBusinessTest {
});
}
@Test
@SuppressWarnings("unchecked")
public void dashboardSeparatesBuyerSupplierAndActualLedgerMoney() {
Map<String, Object> order = create("DASHBOARD-CHARGE");
store.update("order", number(order, "id"), map("supplier_user_id", 20,
"supplier_account_id", supplier, "status", "SUCCESS", "service_expires_at", after(3600)));
tx.execute(status -> { funds.charge(store.get("order", number(order, "id"), true)); return null; });
RentalDashboard dashboard = new RentalDashboard(store);
Map<String, Object> buyer = dashboard.overview(10, "account", "NILE", 7);
Map<String, Object> seller = dashboard.overview(20, "supplier", "NILE", 7);
Map<String, Object> bought = (Map<String, Object>) buyer.get("orders");
Map<String, Object> sold = (Map<String, Object>) seller.get("orders");
assertEquals(1, number(bought, "total"));
assertEquals(1, number(sold, "success"));
assertEquals("10.000000", text(bought, "amount"));
assertEquals("7.600000", text(sold, "amount"));
assertEquals(1, number((Map<String, Object>) buyer.get("monitoring"), "active_leases"));
assertEquals(0, number((Map<String, Object>) dashboard.overview(10, "supplier", "NILE", 7).get("orders"), "total"));
assertEquals(0, number((Map<String, Object>) dashboard.overview(20, "account", "NILE", 7).get("orders"), "total"));
assertEquals(0, number((Map<String, Object>) dashboard.overview(10, "account", "MAINNET", 7).get("orders"), "total"));
assertFalse(((Map<String, Object>) buyer.get("balance")).containsKey("pending"));
assertEquals(7, ((List<?>) buyer.get("trend")).size());
Map<String, Object> today = (Map<String, Object>) ((List<?>) buyer.get("trend")).get(6);
assertEquals("10.000000", text(today, "amount"));
assertEquals(1, number(today, "total"));
}
@Test
@SuppressWarnings("unchecked")
public void dashboardUsesHeartbeatLeaseAndFreshNonnegativeResourceSnapshots() {
RentalDashboard dashboard = new RentalDashboard(store);
store.update("node", node, map("heartbeat_expires_at", after(-1), "heartbeat_at", now()));
store.update("wallet", wallet, map("snapshot_expires_at", after(300), "snapshot_block_height", 100,
"snapshot_min_block_height", 99, "energy_available", 500, "bandwidth_available", 200,
"bandwidth_enabled", 1));
Map<String, Object> result = dashboard.overview(20, "supplier", "NILE", 14);
assertEquals(1, number((Map<String, Object>) result.get("nodes"), "total"));
assertEquals(0, number((Map<String, Object>) result.get("nodes"), "online"));
assertEquals(Boolean.FALSE, ((Map<String, Object>) ((List<?>) result.get("node_status")).get(0)).get("online"));
assertEquals(500, number((Map<String, Object>) result.get("wallets"), "energy"));
assertEquals(200, number((Map<String, Object>) result.get("wallets"), "bandwidth"));
store.update("wallet", wallet, map("snapshot_expires_at", after(-1)));
assertEquals(0, number((Map<String, Object>) dashboard.overview(20, "supplier", "NILE", 14).get("wallets"), "energy"));
store.update("wallet", wallet, map("snapshot_expires_at", after(300), "energy_available", -10,
"bandwidth_available", -5));
Map<String, Object> nonnegative = (Map<String, Object>) dashboard.overview(20, "supplier", "NILE", 14).get("wallets");
assertEquals(0, number(nonnegative, "energy"));
assertEquals(0, number(nonnegative, "bandwidth"));
assertEquals(0, number((Map<String, Object>) dashboard.overview(10, "supplier", "NILE", 14).get("nodes"), "total"));
}
@Test
@SuppressWarnings("unchecked")
public void dashboardAggregatesBeyondPageLimitAndEmptyReadsDoNotOpenAccounts() {
Map<String, Object> original = create("DASHBOARD-MANY");
Map<String, Object> copy = new LinkedHashMap<>(original);
copy.remove("id");
for (int index = 0; index < 55; index++) {
copy.put("order_no", "DASH-" + index);
copy.put("merchant_order_no", "DASH-" + index);
store.insert("order", copy);
}
RentalDashboard dashboard = new RentalDashboard(store);
Map<String, Object> result = dashboard.overview(10, "account", "NILE", 30);
assertEquals(56, number((Map<String, Object>) result.get("orders"), "total"));
assertEquals("0.000000", text((Map<String, Object>) result.get("orders"), "amount"));
assertEquals(6, ((List<?>) result.get("recent_orders")).size());
assertEquals(30, ((List<?>) result.get("trend")).size());
Map<String, Object> empty = dashboard.overview(999, "account", "MAINNET", 7);
assertEquals("NOT_OPEN", text((Map<String, Object>) empty.get("balance"), "status"));
assertEquals(0, store.rows("SELECT id FROM rent_account WHERE user_id=999").size());
expectFailure(() -> dashboard.overview(10, "admin", "NILE", 7));
expectFailure(() -> dashboard.overview(10, "account", "OTHER", 7));
expectFailure(() -> dashboard.overview(10, "account", "NILE", 365));
}
@Test
@SuppressWarnings("unchecked")
public void dashboardKeepsCurrentAlertsOutsideRangeAndAllowsNegativeNetSpending() {
Map<String, Object> order = create("DASHBOARD-HISTORY");
long orderId = number(order, "id");
store.update("order", orderId, map("supplier_user_id", 20, "supplier_account_id", supplier,
"status", "SUCCESS", "service_expires_at", after(-100), "reclaim_status", "MANUAL_REVIEW"));
tx.execute(status -> { funds.charge(store.get("order", orderId, true)); return null; });
// 早期扣款不进入本期消费;当前退款仍应进入本期,形成负净消费。
store.execute("UPDATE rent_ledger SET created_at=? WHERE event_type='CHARGE'", now().minusDays(40));
store.update("order", orderId, map("created_at", now().minusDays(40)));
tx.execute(status -> { funds.post(payer, "DASH-REFUND", "REFUND", money("2"), ZERO,
ZERO, ZERO, orderId, null, null, 99, "fixture", "看板退款口径测试"); return null; });
orders.webhook(store.get("order", orderId, false), "SUCCESS", "DASH-WEBHOOK");
store.execute("UPDATE rent_webhook SET status='DEAD' WHERE order_id=?", orderId);
RentalDashboard dashboard = new RentalDashboard(store);
Map<String, Object> result = dashboard.overview(10, "account", "NILE", 7);
assertEquals(0, number((Map<String, Object>) result.get("orders"), "total"));
assertEquals("-2.000000", text((Map<String, Object>) result.get("orders"), "amount"));
assertEquals(1, number((Map<String, Object>) result.get("monitoring"), "manual"));
assertEquals(1, number((Map<String, Object>) result.get("monitoring"), "reclaim_pending"));
assertEquals(1, number((Map<String, Object>) ((List<?>) result.get("webhooks")).get(0), "total"));
assertTrue(((List<?>) dashboard.overview(20, "account", "NILE", 7).get("webhooks")).isEmpty());
assertTrue(((List<?>) dashboard.overview(10, "account", "MAINNET", 7).get("webhooks")).isEmpty());
}
private Map<String, Object> create(String number) {
return tx.execute(
status ->
+19
View File
@@ -0,0 +1,19 @@
-- 角色看板的可选性能升级;不修改业务数据,不影响旧接口。
-- MySQL DDL会隐式提交,建议维护窗口执行;按索引名检查,可重复执行。
SET @rent_dashboard_ddl = IF(
EXISTS(SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE()
AND table_name='rent_order' AND index_name='idx_order_supplier_dashboard'),
'SELECT 1',
'ALTER TABLE rent_order ADD INDEX idx_order_supplier_dashboard (supplier_user_id,network,created_at)');
PREPARE rent_dashboard_stmt FROM @rent_dashboard_ddl;
EXECUTE rent_dashboard_stmt;
DEALLOCATE PREPARE rent_dashboard_stmt;
SET @rent_dashboard_ddl = IF(
EXISTS(SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE()
AND table_name='rent_ledger' AND index_name='idx_ledger_dashboard'),
'SELECT 1',
'ALTER TABLE rent_ledger ADD INDEX idx_ledger_dashboard (account_id,created_at)');
PREPARE rent_dashboard_stmt FROM @rent_dashboard_ddl;
EXECUTE rent_dashboard_stmt;
DEALLOCATE PREPARE rent_dashboard_stmt;
+2
View File
@@ -250,6 +250,7 @@ CREATE TABLE IF NOT EXISTS `rent_order` (
KEY `idx_order_dispatch_expire` (`status`,`dispatch_deadline`),
KEY `idx_order_reclaim` (`reclaim_status`,`next_reclaim_at`),
KEY `idx_order_supplier` (`supplier_account_id`,`status`,`id`),
KEY `idx_order_supplier_dashboard` (`supplier_user_id`,`network`,`created_at`),
KEY `idx_order_app` (`app_id`,`created_at`)
) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='能量或带宽租赁订单;一单一种资源一个钱包,履约与回收分开';
@@ -365,6 +366,7 @@ CREATE TABLE IF NOT EXISTS `rent_ledger` (
PRIMARY KEY (`id`),
UNIQUE KEY `uk_ledger_business` (`business_key`),
KEY `idx_ledger_account` (`account_id`,`id`),
KEY `idx_ledger_dashboard` (`account_id`,`created_at`),
KEY `idx_ledger_order` (`order_id`,`id`)
) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='不可变租赁资金流水;余额与流水同事务,冲正追加不覆盖';