目前还缺少,套餐绑定关系的逻辑,请单独一张表,并且引导添加user\_id系统用户绑定套餐逻辑,并且在创建租赁订单,自动关联应用对应user\_id的套餐信息。 另外给我一个脚本,创建3个套餐的脚本。

This commit is contained in:
lu7213 committed 2026-10-25 11:20:45 -04:00
1 parent a83e1fef40
commit 0fd0450ddb
16 files changed
+299 -15

No files matched your search

@@ -133,6 +133,58 @@ public class RentalBusinessTest {
expectFailure(() -> tx.execute(status -> identity.deleteAppCredential(number(nodeKey, "id"), 20)));
}
/** 用户默认套餐选择及授权隔离,不受客户端user_id影响。 */
@Test
public void userBindingsControlAutomaticAndExplicitOrders() throws Exception {
store.execute("CREATE TABLE sys_user(user_id BIGINT PRIMARY KEY,user_name VARCHAR(64),nick_name VARCHAR(64),status CHAR(1),del_flag CHAR(1))");
store.execute("INSERT INTO sys_user VALUES(10,'buyer','buyer','0','0')");
RentalPackageBindings bindings = new RentalPackageBindings(store);
Map<String, Object> request = map("merchant_order_no", "AUTO-1", "receiver_address", ADDRESS, "user_id", 20);
Map<String, Object> original = tx.execute(status -> orders.create(app, 10, request));
assertEquals(product, number(original, "package_id"));
Map snapshot = json.readValue(text(original, "package_snapshot"), Map.class);
assertEquals(10L, ((Number) snapshot.get("binding_user_id")).longValue());
assertEquals(1, new RentalQueries(store).list("package", 10L, 1).size());
assertTrue(new RentalQueries(store).list("package", 20L, 1).isEmpty());
Map<String, Object> alternate = new LinkedHashMap<>(store.get("package", product, false));
alternate.remove("id"); alternate.put("package_code", "ALT-TEST");
long alternativeId = store.insert("package", alternate);
expectFailure(() -> tx.execute(status -> orders.create(app, 10,
map("package_id", alternativeId, "merchant_order_no", "NOT-BOUND", "receiver_address", ADDRESS))));
tx.execute(status -> { bindings.bind(10, alternativeId, true, true, 99); return null; });
Map<String, Object> next = tx.execute(status -> orders.create(app, 10,
map("merchant_order_no", "AUTO-2", "receiver_address", ADDRESS)));
assertEquals(alternativeId, number(next, "package_id"));
assertEquals(number(original, "id"), number(tx.execute(status -> orders.create(app, 10, request)), "id"));
assertEquals(1, store.rows("SELECT id FROM rent_user_package WHERE user_id=10 AND default_slot=1").size());
tx.execute(status -> { bindings.bind(10, alternativeId, false, false, 99); return null; });
expectFailure(() -> tx.execute(status -> orders.create(app, 10,
map("merchant_order_no", "NO-DEFAULT", "receiver_address", ADDRESS))));
expectFailure(() -> tx.execute(status -> orders.create(app, 10,
map("package_id", alternativeId, "merchant_order_no", "DISABLED", "receiver_address", ADDRESS))));
expectFailure(() -> tx.execute(status -> { bindings.bind(999, product, true, true, 99); return null; }));
assertEquals(number(next, "id"), number(tx.execute(status -> orders.create(app, 10,
map("merchant_order_no", "AUTO-2", "receiver_address", ADDRESS))), "id"));
}
/** 直接验证交付脚本中的三套餐INSERT及重复执行,不连接真实MySQL。 */
@Test
public void seedScriptCreatesThreeValidPackagesIdempotently() throws Exception {
String script = new String(Files.readAllBytes(Paths.get("../sql/rent_seed_three_packages.sql")), StandardCharsets.UTF_8);
int start = script.indexOf("INSERT INTO rent_package(");
String insert = script.substring(start, script.indexOf(';', start))
.replace("JSON_OBJECT('refund','MANUAL_REVIEW','delegate_lock',FALSE)", "'{\"refund\":\"MANUAL_REVIEW\",\"delegate_lock\":false}'")
.replace("UTC_TIMESTAMP(3)", "CURRENT_TIMESTAMP");
store.execute(insert);
store.execute(insert);
List<Map<String, Object>> products = store.rows("SELECT * FROM rent_package WHERE package_code LIKE 'DEMO_%'");
assertEquals(3, products.size());
for (Map<String, Object> seeded : products) {
RentalOrders.validatePackage(seeded);
assertEquals("NILE", text(seeded, "network"));
}
}
private RentalProvisioning rentalDeletion() { return new RentalProvisioning(store, orders); }
@Before
@@ -246,6 +298,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));
wallet =
store.insert(
"wallet",
@@ -895,6 +948,7 @@ public class RentalBusinessTest {
"{}",
"status",
"ACTIVE"));
store.insert("user_package", map("user_id", 10, "package_id", bandwidth, "status", "ACTIVE", "created_by", 99));
Map<String, Object> order =
tx.execute(
status ->