创建租赁订单,不要传递套餐id,改成选择网络和资源类型,修改对应的接口,和api-debugger调试页面,和套餐页面的立即租赁的页面入参。

This commit is contained in:
lu7213 committed 2026-10-30 08:31:27 -04:00
1 parent 8605c946c9
commit dafa5261bd
20 files changed
+381 -119

No files matched your search

@@ -173,6 +173,168 @@ public class RentalBusinessTest {
map("merchant_order_no", "AUTO-2", "receiver_address", ADDRESS))), "id"));
}
/** 四个分类独立共存、精确选取和幂等重试;同分类替换不影响其他三类。 */
@Test
public void networkAndResourceBindingsAreIndependent() throws Exception {
store.execute("CREATE TABLE sys_user(user_id BIGINT PRIMARY KEY,status CHAR(1),del_flag CHAR(1))");
store.execute("INSERT INTO sys_user VALUES(10,'0','0')");
RentalPackageBindings bindings = new RentalPackageBindings(store);
Map<String, Object> retry = map("merchant_order_no", "SCOPE-ORIGINAL", "receiver_address", ADDRESS);
Map<String, Object> original = tx.execute(status -> orders.create(app, 10, retry));
long bandwidth = scopedProduct("NILE", "BANDWIDTH", "SCOPE-NB");
long mainEnergy = scopedProduct("MAINNET", "ENERGY", "SCOPE-ME");
long mainBandwidth = scopedProduct("MAINNET", "BANDWIDTH", "SCOPE-MB");
for (long id : new long[] {bandwidth, mainEnergy, mainBandwidth}) {
tx.execute(status -> { bindings.bind(10, id, true, true, 99); return null; });
}
assertEquals(4, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND default_slot=1").size());
RentalDashboard dashboard = new RentalDashboard(store);
assertEquals(2, ((List<?>) dashboard.overview(10, "account", "NILE", 7).get("packages")).size());
assertEquals(2, ((List<?>) dashboard.overview(10, "account", "MAINNET", 7).get("packages")).size());
assertTrue(((List<?>) dashboard.overview(20, "account", "NILE", 7).get("packages")).isEmpty());
assertEquals(mainEnergy, number(RentalPackageBindings.resolve(store, 10,
map("network", "MAINNET", "resource_type", "ENERGY"), false), "id"));
assertEquals(bandwidth, number(RentalPackageBindings.resolve(store, 10,
map("package_id", bandwidth, "network", "NILE", "resource_type", "BANDWIDTH"), false), "id"));
expectFailure(() -> RentalPackageBindings.resolve(store, 10, map(), false));
expectFailure(() -> RentalPackageBindings.resolve(store, 10, map("network", "NILE"), false));
expectFailure(() -> RentalPackageBindings.resolve(store, 10, map("package_id", product, "network", "MAINNET"), false));
expectFailure(() -> RentalPackageBindings.resolve(store, 20, map("package_id", product), false));
expectFailure(() -> tx.execute(status -> orders.create(app, 10,
map("merchant_order_no", "AMBIGUOUS", "receiver_address", ADDRESS))));
Map<String, Object> scoped = tx.execute(status -> orders.create(app, 10,
map("network", "NILE", "resource_type", "BANDWIDTH", "merchant_order_no", "SCOPED", "receiver_address", ADDRESS)));
assertEquals(bandwidth, number(scoped, "package_id"));
long replacement = scopedProduct("NILE", "ENERGY", "SCOPE-NEW");
tx.execute(status -> { bindings.bind(10, replacement, true, true, 99); return null; });
assertEquals(4, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND default_slot=1").size());
assertEquals(number(original, "id"), number(tx.execute(status -> orders.create(app, 10, retry)), "id"));
expectFailure(() -> tx.execute(status -> orders.create(app, 10,
map("merchant_order_no", "SCOPE-ORIGINAL", "receiver_address", ADDRESS, "network", "MAINNET"))));
tx.execute(status -> { bindings.bind(10, replacement, false, false, 99); return null; });
expectFailure(() -> RentalPackageBindings.resolve(store, 10, map("network", "NILE", "resource_type", "ENERGY"), false));
assertEquals(bandwidth, number(RentalPackageBindings.resolve(store, 10, map("network", "NILE"), false), "id"));
}
/** 签名API按分类筛选,报价与实际下单使用完全相同的选择规则。 */
@Test
@SuppressWarnings("unchecked")
public void scopedMerchantPackagesQuoteAndCreateAgree() throws Exception {
long bandwidth = scopedProduct("NILE", "BANDWIDTH", "API-BANDWIDTH");
store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "network", "NILE",
"resource_type", "BANDWIDTH", "status", "ACTIVE", "default_slot", 1, "created_by", 99));
Map<String, Object> credential = tx.execute(status -> identity.issue("APP", app, 10));
String key = text(credential, "api_key"), secret = text(credential, "api_secret");
RentalApiController api = new RentalApiController(identity, store, orders, json);
List<Map<String, Object>> products = (List<Map<String, Object>>) api.execute("packages",
signedRequest("/api/rental/v1/packages", "{\"network\":\"NILE\"}", key, secret, "API")).get("data");
assertEquals(2, products.size());
List<Map<String, Object>> filtered = (List<Map<String, Object>>) api.execute("packages",
signedRequest("/api/rental/v1/packages", "{\"network\":\"NILE\",\"resource_type\":\"BANDWIDTH\"}", key, secret, "API")).get("data");
assertEquals(1, filtered.size());
assertEquals(bandwidth, number(filtered.get(0), "id"));
Map<String, Object> request = map("network", "NILE", "resource_type", "BANDWIDTH",
"receiver_address", ADDRESS, "merchant_order_no", "API-SCOPE");
Map<String, Object> quote = (Map<String, Object>) api.execute("quote",
signedRequest("/api/rental/v1/quote", json.writeValueAsString(request), key, secret, "API")).get("data");
assertEquals(bandwidth, number(quote, "package_id"));
assertEquals("BANDWIDTH", text(quote, "resource_type"));
request.put("expected_amount", quote.get("amount"));
Map<String, Object> order = tx.execute(status -> orders.create(app, 10, request));
assertEquals(bandwidth, number(order, "package_id"));
assertEquals(amount(quote, "amount"), amount(order, "sale_amount"));
request.remove("resource_type");
expectFailure(() -> { try { api.execute("quote", signedRequest("/api/rental/v1/quote",
json.writeValueAsString(request), key, secret, "API")); } catch (Exception ex) { throw new IllegalArgumentException(ex); } });
}
/** 对外请求禁止套餐ID,分类均必填;更换绑定后原单仍按历史快照幂等。 */
@Test
public void resourceOnlyEntryRejectsPackageIdsAndRequiresBothSelectors() throws Exception {
Map<String, Object> credential = tx.execute(status -> identity.issue("APP", app, 10));
String key = text(credential, "api_key"), secret = text(credential, "api_secret");
RentalApiController api = new RentalApiController(identity, store, orders, json);
Map<String, Object> valid = map("network", "NILE", "resource_type", "ENERGY",
"receiver_address", ADDRESS, "merchant_order_no", "RESOURCE-ONLY");
List<Map<String, Object>> invalidRequests = new ArrayList<>();
for (String missing : Arrays.asList("network", "resource_type")) {
Map<String, Object> invalid = new LinkedHashMap<>(valid);
invalid.remove(missing); invalidRequests.add(invalid);
}
for (Object id : Arrays.asList(product, "", "99999")) {
Map<String, Object> invalid = new LinkedHashMap<>(valid);
invalid.put("package_id", id); invalidRequests.add(invalid);
}
Map<String, Object> unknown = new LinkedHashMap<>(valid);
unknown.put("resource_type", "BANDWIDTH"); invalidRequests.add(unknown);
for (Map<String, Object> invalid : invalidRequests) {
expectFailure(() -> tx.execute(status -> orders.createByResource(app, 10, invalid)));
for (String operation : Arrays.asList("quote", "create")) {
expectFailure(() -> {
try {
tx.execute(status -> {
try {
return api.execute(operation, signedRequest("/api/rental/v1/" + operation,
json.writeValueAsString(invalid), key, secret, "API"));
} catch (Exception ex) { throw new IllegalArgumentException(ex); }
});
} catch (Exception ex) { throw new IllegalArgumentException(ex); }
});
}
}
assertEquals(0, store.rows("SELECT id FROM rent_order").size());
assertEquals(money("100"), amount(store.get("account", payer, false), "available_amount"));
Map<String, Object> original = tx.execute(status -> orders.createByResource(app, 10, valid));
store.execute("CREATE TABLE sys_user(user_id BIGINT PRIMARY KEY,status CHAR(1),del_flag CHAR(1))");
store.execute("INSERT INTO sys_user VALUES(10,'0','0')");
long replacement = scopedProduct("NILE", "ENERGY", "REPLACED-RESOURCE-ONLY");
tx.execute(status -> { new RentalPackageBindings(store).bind(10, replacement, true, true, 99); return null; });
Map<String, Object> retried = tx.execute(status -> orders.createByResource(app, 10, valid));
assertEquals(number(original, "id"), number(retried, "id"));
assertEquals(product, number(retried, "package_id"));
assertEquals(money("90"), amount(store.get("account", payer, false), "available_amount"));
Map<String, Object> changed = new LinkedHashMap<>(valid);
changed.put("network", "MAINNET");
expectFailure(() -> tx.execute(status -> orders.createByResource(app, 10, changed)));
changed.put("network", "NILE"); changed.put("resource_type", "BANDWIDTH");
expectFailure(() -> tx.execute(status -> orders.createByResource(app, 10, changed)));
}
/** 数据库分类唯一键为并发与绕过服务写入提供最后一道保护。 */
@Test
public void scopedBindingUniquenessAndConcurrentReplacement() throws Exception {
store.execute("CREATE TABLE sys_user(user_id BIGINT PRIMARY KEY,status CHAR(1),del_flag CHAR(1))");
store.execute("INSERT INTO sys_user VALUES(10,'0','0')");
long first = scopedProduct("NILE", "ENERGY", "CONCURRENT-1");
long second = scopedProduct("NILE", "ENERGY", "CONCURRENT-2");
try {
store.insert("user_package", map("user_id", 10, "package_id", first, "network", "NILE",
"resource_type", "ENERGY", "status", "ACTIVE", "default_slot", 1, "created_by", 99));
fail("same scope must be unique");
} catch (org.springframework.dao.DuplicateKeyException expected) { /* 唯一键按预期拒绝。 */ }
RentalPackageBindings bindings = new RentalPackageBindings(store);
ExecutorService executor = Executors.newFixedThreadPool(2);
CountDownLatch start = new CountDownLatch(1);
try {
List<Future<?>> futures = new ArrayList<>();
for (long id : new long[] {first, second}) {
futures.add(executor.submit(() -> {
try { start.await(); } catch (InterruptedException ex) { Thread.currentThread().interrupt(); throw new IllegalStateException(ex); }
tx.execute(status -> { bindings.bind(10, id, true, true, 99); return null; });
}));
}
start.countDown();
for (Future<?> future : futures) { future.get(15, TimeUnit.SECONDS); }
assertEquals(1, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND default_slot=1").size());
} finally { executor.shutdownNow(); }
}
private long scopedProduct(String network, String resourceType, String code) {
Map<String, Object> copy = new LinkedHashMap<>(store.get("package", product, false));
copy.remove("id"); copy.put("network", network); copy.put("resource_type", resourceType); copy.put("package_code", code);
return store.insert("package", copy);
}
/** 直接验证交付脚本中的三套餐INSERT及重复执行,不连接真实MySQL。 */
@Test
public void seedScriptCreatesThreeValidPackagesIdempotently() throws Exception {
@@ -327,7 +489,7 @@ public class RentalBusinessTest {
"{}",
"status",
"ACTIVE"));
store.insert("user_package", map("user_id", 10, "package_id", product, "status", "ACTIVE", "default_slot", 1, "created_by", 99));
store.insert("user_package", map("user_id", 10, "package_id", product, "network", "NILE", "resource_type", "ENERGY", "status", "ACTIVE", "default_slot", 1, "created_by", 99));
wallet =
store.insert(
"wallet",
@@ -596,7 +758,7 @@ public class RentalBusinessTest {
Map<String, Object> credential = tx.execute(status -> identity.issue("APP", app, 10));
String key = text(credential, "api_key"), secret = text(credential, "api_secret");
RentalApiController controller = new RentalApiController(identity, store, orders, json);
Map<String, Object> data = map("package_id", product, "merchant_order_no", "API-RENT",
Map<String, Object> data = map("network", "NILE", "resource_type", "ENERGY", "merchant_order_no", "API-RENT",
"duration_seconds", 7200, "receiver_address", ADDRESS);
Map<String, Object> quote = (Map<String, Object>) controller.execute("quote",
signedRequest("/api/rental/v1/quote", json.writeValueAsString(data), key, secret, "API")).get("data");
@@ -1387,7 +1549,7 @@ public class RentalBusinessTest {
"status",
"ACTIVE"));
store.execute("UPDATE rent_user_package SET status='DISABLED',default_slot=NULL WHERE user_id=10");
store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "status", "ACTIVE", "default_slot", 1, "created_by", 99));
store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "network", "NILE", "resource_type", "BANDWIDTH", "status", "ACTIVE", "default_slot", 1, "created_by", 99));
Map<String, Object> order =
tx.execute(
status ->