创建租赁订单,不要传递套餐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

@@ -97,14 +97,18 @@ public class RentalApiController {
// 类型由路由确定;无需客户端通过通用接口选择转账业务。
data.put("order_type", expectedType);
if ("packages".equals(operation)) {
String selectedNetwork = network(input(data, "network", 16));
String selectedResource = data.containsKey("resource_type") ? resource(input(data, "resource_type", 16)) : null;
List<Map<String, Object>> products =
store.rows(
"SELECT"
+ " id,package_code,revision,name,network,resource_type,resource_quantity,duration_seconds,sale_amount"
+ " id,package_code,revision,name,network,resource_type,billing_mode,resource_quantity,duration_seconds,sale_amount"
+ " FROM rent_package p WHERE status='ACTIVE' AND network=?"
+ " AND EXISTS(SELECT 1 FROM rent_user_package b WHERE b.package_id=p.id AND b.user_id=? AND b.status='ACTIVE' AND b.default_slot=1) ORDER BY"
+ " id",
network(input(data, "network", 16)), number(app, "user_id"));
+ " AND EXISTS(SELECT 1 FROM rent_user_package b WHERE b.package_id=p.id AND b.user_id=?"
+ " AND b.network=p.network AND b.resource_type=p.resource_type AND b.status='ACTIVE' AND b.default_slot=1)"
+ (selectedResource == null ? "" : " AND resource_type=?") + " ORDER BY resource_type,id",
selectedResource == null ? new Object[] {selectedNetwork, number(app, "user_id")}
: new Object[] {selectedNetwork, number(app, "user_id"), selectedResource});
return AjaxResult.success(products);
}
Map<String, Object> order;
@@ -119,24 +123,20 @@ public class RentalApiController {
}
require(text(data, "order_type").isEmpty() || "RESOURCE_RENTAL".equals(text(data, "order_type")),
"不支持的订单类型");
RentalPackageBindings.requireResourceSelection(data);
RentalOrders.address(input(data, "receiver_address", 64));
if (!text(data, "notify_url").trim().isEmpty()) {
RentalHttp.checkUrl(text(data, "notify_url").trim());
}
Map<String, Object> product = store.one("SELECT p.* FROM rent_package p"
+ " JOIN rent_user_package b ON b.package_id=p.id WHERE b.user_id=?"
+ " AND b.status='ACTIVE' AND b.default_slot=1 AND p.status='ACTIVE' AND p.id=?",
number(app, "user_id"), number(data, "package_id"));
require(product != null, "套餐未绑定或已下架");
RentalOrders.validatePackage(product);
Map<String, Object> product = RentalPackageBindings.resolve(store, number(app, "user_id"), data, false);
Map<String, Object> price = RentalPricing.price(product, data);
return AjaxResult.success(map("package_id", price.get("id"), "network", price.get("network"),
"billing_mode", price.get("billing_mode"), "requested_resource_quantity", price.get("requested_resource_quantity"),
"resource_type", price.get("resource_type"), "billing_mode", price.get("billing_mode"), "requested_resource_quantity", price.get("requested_resource_quantity"),
"duration_seconds", price.get("duration_seconds"), "amount", amount(price, "sale_amount").toPlainString(),
"resource_quantity", price.get("resource_quantity"), "currency", "USDT"));
}
if ("create".equals(operation)) {
order = orders.create(number(app, "id"), number(app, "user_id"), data);
order = orders.createByResource(number(app, "id"), number(app, "user_id"), data);
} else {
order =
store.one(
@@ -224,7 +224,7 @@ public class RentalController {
@PostMapping("/order")
@PreAuthorize("@ss.hasPermi('rent:order:create')")
public AjaxResult order(@RequestBody Map<String, Object> body) {
Map<String, Object> order = orders.create(number(body, "app_id"), user(), body);
Map<String, Object> order = orders.createByResource(number(body, "app_id"), user(), body);
return AjaxResult.success(
map(
"id",
@@ -156,9 +156,10 @@ public class RentalDashboard {
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,"
result.put("packages", store.rows("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));
+ " WHERE b.user_id=? AND b.network=? AND b.network=p.network AND b.resource_type=p.resource_type"
+ " AND b.status='ACTIVE' AND b.default_slot=1 ORDER BY p.resource_type", user, network));
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));
@@ -38,6 +38,18 @@ public class RentalOrders {
}
}
/**
* HTTP下单统一入口:资源订单必须指定网络和资源类型,套餐ID仅由服务端解析并落库。
* 地址上链仍复用原独立规则。原商户单号重试由create保留原套餐快照,不重新匹配新绑定。
*/
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> createByResource(long appId, long user, Map<String, Object> request) {
if (!RentalOnchain.isOrder(request)) {
RentalPackageBindings.requireResourceSelection(request);
}
return create(appId, user, request);
}
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> create(long appId, long user, Map<String, Object> request) {
// 锁应用行使同应用幂等竞争顺序化;不能仅依靠先查后插。
@@ -64,10 +76,7 @@ public class RentalOrders {
// 默认套餐变更后,幂等重试仍关联原订单版本,不重新扣款。
packageId = number(existing, "package_id");
} else {
Map<String, Object> binding = store.one("SELECT package_id FROM rent_user_package"
+ " WHERE user_id=? AND status='ACTIVE' AND default_slot=1", number(app, "user_id"));
require(binding != null, "该应用所属用户尚未设置默认套餐,请联系管理员绑定,或选择已绑定套餐");
packageId = number(binding, "package_id");
packageId = number(RentalPackageBindings.resolve(store, number(app, "user_id"), request, false), "id");
}
String notify = text(request, "notify_url").trim();
if (notify.isEmpty()) {
@@ -96,25 +105,13 @@ public class RentalOrders {
}
if (existing != null) {
require(hash.equals(text(existing, "request_hash")), "同一商户订单号参数不一致");
require(!request.containsKey("network") || text(existing, "network").equals(text(request, "network")), "原订单网络与请求不符");
require(!request.containsKey("resource_type") || text(existing, "resource_type").equals(text(request, "resource_type")), "原订单资源类型与请求不符");
return existing;
}
Map<String, Object> product = store.get("package", packageId, true);
validatePackage(product);
require("ACTIVE".equals(text(product, "status")), "套餐未上架");
Map<String, Object> binding = store.one("SELECT * FROM rent_user_package"
+ " WHERE user_id=? AND package_id=? AND status='ACTIVE' AND default_slot=1 FOR UPDATE",
number(app, "user_id"), packageId);
require(binding != null, "该套餐未绑定到应用所属用户或绑定已停用");
if (request.containsKey("network")) {
require(text(product, "network").equals(text(request, "network")), "套餐网络与请求不符");
}
product.put("binding_id", binding.get("id"));
product.put("binding_user_id", app.get("user_id"));
if (request.containsKey("resource_type")) {
require(
text(product, "resource_type").equals(text(request, "resource_type")),
"资源类型与套餐不符");
}
Map<String, Object> selection = new java.util.LinkedHashMap<>(request);
selection.put("package_id", packageId);
Map<String, Object> product = RentalPackageBindings.resolve(store, number(app, "user_id"), selection, true);
product = RentalPricing.price(product, request);
if (request.containsKey("expected_amount")) {
require(amount(product, "sale_amount").compareTo(amount(request, "expected_amount")) == 0,
@@ -4,11 +4,13 @@ import static com.ruoyi.system.rental.RentalValues.*;
import java.util.List;
import java.util.Map;
import java.util.ArrayList;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/** 用户级套餐授权;客户端不能通过更换 app_id、user_id 或 package_id 越权购买。 */
@Service
@lombok.extern.slf4j.Slf4j
public class RentalPackageBindings {
private final RentalStore store;
@@ -16,7 +18,14 @@ public class RentalPackageBindings {
this.store = store;
}
/** 管理员先选系统用户,再配置绑定;锁用户行使同用户默认套餐切换串行化。 */
/** 外部报价/下单只按分类选套餐,禁止客户端用内部套餐编号绕过当前绑定。 */
public static void requireResourceSelection(Map<String, Object> request) {
require(!request.containsKey("package_id"), "不再支持package_id,请提交network和resource_type");
network(input(request, "network", 16));
resource(input(request, "resource_type", 16));
}
/** 锁定系统用户,使同用户绑定切换串行;只有同网络同资源类型的旧绑定会被停用。 */
@Transactional(rollbackFor = Exception.class)
public void bind(long userId, long packageId, boolean enabled, boolean makeDefault, long actor) {
require(store.one("SELECT user_id FROM sys_user WHERE user_id=? AND del_flag='0' AND status='0' FOR UPDATE", userId) != null,
@@ -26,14 +35,17 @@ public class RentalPackageBindings {
require("ACTIVE".equals(text(product, "status")), "请先审核上架套餐再绑定用户");
RentalOrders.validatePackage(product);
}
// 一人仅一个当前套餐,切换时停用其他绑定,历史记录继续保留。
String network = network(text(product, "network"));
String resourceType = resource(text(product, "resource_type"));
// 分类由可信套餐确定,不接受请求覆盖;不同网络/资源类型互不替换。
if (enabled) {
store.execute("UPDATE rent_user_package SET status='DISABLED',default_slot=NULL,version=version+1,updated_at=? WHERE user_id=? AND package_id<>?",
now(), userId, packageId);
store.execute("UPDATE rent_user_package SET status='DISABLED',default_slot=NULL,version=version+1,updated_at=?"
+ " WHERE user_id=? AND network=? AND resource_type=? AND package_id<>? AND (status='ACTIVE' OR default_slot IS NOT NULL)",
now(), userId, network, resourceType, packageId);
}
Map<String, Object> existing = store.one("SELECT * FROM rent_user_package WHERE user_id=? AND package_id=? FOR UPDATE", userId, packageId);
Map<String, Object> values = map("status", enabled ? "ACTIVE" : "DISABLED",
"default_slot", enabled ? 1 : null);
"default_slot", enabled ? 1 : null, "network", network, "resource_type", resourceType);
if (existing == null) {
values.put("user_id", userId);
values.put("package_id", packageId);
@@ -43,14 +55,54 @@ public class RentalPackageBindings {
store.update("user_package", number(existing, "id"), values);
}
store.event("PACKAGE", packageId, "BIND_USER", actor,
"用户ID=" + userId + ",状态=" + values.get("status") + ",一人一个当前套餐");
"用户ID=" + userId + ",网络=" + network + ",资源=" + resourceType + ",状态=" + values.get("status"));
log.info("用户分类套餐绑定完成 userId={} packageId={} network={} resourceType={} enabled={} actorId={}",
userId, packageId, network, resourceType, enabled, actor);
}
/** 显式安全列,供本人/管理员页面查看,不返回成本或供应商利润。 */
public List<Map<String, Object>> list(long userId) {
return store.rows("SELECT b.id AS binding_id,b.user_id,b.package_id,b.status AS binding_status,b.default_slot,"
+ "p.name,p.revision,p.network,p.resource_type,p.resource_quantity,p.redundancy_percent,p.duration_seconds,p.sale_amount,p.status"
+ "p.name,p.revision,b.network,b.resource_type,p.billing_mode,p.resource_quantity,p.redundancy_percent,p.duration_seconds,p.sale_amount,p.status"
+ " FROM rent_user_package b JOIN rent_package p ON p.id=b.package_id"
+ " WHERE b.user_id=? ORDER BY b.default_slot DESC,b.id DESC", userId);
+ " WHERE b.user_id=? ORDER BY b.network,b.resource_type,b.default_slot DESC,b.id DESC", userId);
}
/**
* 报价与下单共用分类解析。显式ID必须为本人有效绑定;省略ID时按可选网络/资源过滤,
* 只有唯一候选才允许旧客户端继续调用,禁止静默取第一条。调用方下单事务使用lock=true。
*/
public static Map<String, Object> resolve(RentalStore store, long user, Map<String, Object> request, boolean lock) {
StringBuilder sql = new StringBuilder("SELECT p.* FROM rent_package p JOIN rent_user_package b ON b.package_id=p.id"
+ " AND b.network=p.network AND b.resource_type=p.resource_type WHERE b.user_id=?"
+ " AND b.status='ACTIVE' AND b.default_slot=1 AND p.status='ACTIVE'");
List<Object> args = new ArrayList<>();
args.add(user);
if (request.containsKey("package_id") && !text(request, "package_id").isEmpty()) {
sql.append(" AND p.id=?"); args.add(number(request, "package_id"));
}
if (request.containsKey("network")) {
sql.append(" AND p.network=?"); args.add(network(input(request, "network", 16)));
}
if (request.containsKey("resource_type")) {
sql.append(" AND p.resource_type=?"); args.add(resource(input(request, "resource_type", 16)));
}
List<Map<String, Object>> candidates = store.rows(sql.append(" ORDER BY p.id").toString(), args.toArray());
require(!candidates.isEmpty(), "未找到当前分类有效绑定的套餐,请核对套餐ID、网络与资源类型");
require(candidates.size() == 1, "存在多个可用套餐,请指定package_id,或补充network和resource_type");
Map<String, Object> product = candidates.get(0);
if (lock) { product = store.get("package", number(product, "id"), true); }
require("ACTIVE".equals(text(product, "status")), "套餐已下架");
require(!request.containsKey("network") || network(input(request, "network", 16)).equals(text(product, "network")), "套餐网络已变更,请重新报价");
require(!request.containsKey("resource_type") || resource(input(request, "resource_type", 16)).equals(text(product, "resource_type")), "套餐资源类型已变更,请重新报价");
Map<String, Object> binding = store.one("SELECT * FROM rent_user_package WHERE user_id=? AND package_id=?"
+ " AND network=? AND resource_type=? AND status='ACTIVE' AND default_slot=1" + (lock ? " FOR UPDATE" : ""),
user, product.get("id"), product.get("network"), product.get("resource_type"));
require(binding != null, "套餐绑定已变更,请重新选择并报价");
RentalOrders.validatePackage(product);
product.put("binding_id", binding.get("id")); product.put("binding_user_id", user);
log.debug("分类套餐解析成功 userId={} packageId={} network={} resourceType={} lock={}",
user, product.get("id"), product.get("network"), product.get("resource_type"), lock);
return product;
}
}
@@ -27,7 +27,7 @@ public class RentalQueries {
where = "r.user_id=?";
break;
case "package":
where = "r.status='ACTIVE' AND EXISTS(SELECT 1 FROM rent_user_package b WHERE b.package_id=r.id AND b.user_id=? AND b.status='ACTIVE' AND b.default_slot=1)";
where = "r.status='ACTIVE' AND EXISTS(SELECT 1 FROM rent_user_package b WHERE b.package_id=r.id AND b.user_id=? AND b.network=r.network AND b.resource_type=r.resource_type AND b.status='ACTIVE' AND b.default_slot=1)";
break;
case "wallet":
where =
@@ -178,8 +178,19 @@ public class RentPackageServiceImpl extends ServiceImpl<RentPackageMapper, RentP
* @return 结果
*/
@Override
@org.springframework.transaction.annotation.Transactional(rollbackFor = Exception.class)
public int updateRentPackage(RentPackage rentPackage)
{
// 与绑定服务使用同一套餐行锁,防止并发编辑将已绑定套餐移至其他分类。
Map<String, Object> current = jdbcTemplate.queryForMap(
"SELECT network,resource_type FROM rent_package WHERE id=? FOR UPDATE", rentPackage.getId());
boolean scopeChanged = rentPackage.getNetwork() != null && !rentPackage.getNetwork().equals(current.get("network"))
|| rentPackage.getResourceType() != null && !rentPackage.getResourceType().equals(current.get("resource_type"));
if (scopeChanged && jdbcTemplate.queryForObject(
"SELECT COUNT(*) FROM rent_user_package WHERE package_id=?", Long.class, rentPackage.getId()) > 0L)
{
throw new IllegalArgumentException("已有绑定记录的套餐不能修改网络或资源类型,请创建新套餐版本");
}
rentPackage.setUpdatedAt(DateUtils.getNowDate());
return rentPackageMapper.updateRentPackage(rentPackage);
}
@@ -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 ->