From e14e7c51db36969b0604ecc462c3b361b537fa96 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Mon, 26 Oct 2026 20:07:56 -0400 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/rental/resource-quantity.md | 24 +++++++++++++++++++ .../system/rental/RentalApiController.java | 1 + .../com/ruoyi/system/rental/RentalOrders.java | 4 ++++ .../ruoyi/system/rental/RentalPricing.java | 15 ++++++++++-- .../system/rental/RentalPricingTest.java | 13 +++++++++- 5 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 docs/rental/resource-quantity.md diff --git a/docs/rental/resource-quantity.md b/docs/rental/resource-quantity.md new file mode 100644 index 0000000..c27f467 --- /dev/null +++ b/docs/rental/resource-quantity.md @@ -0,0 +1,24 @@ +# 立即租赁资源调整 + +我的套餐 → 立即租赁支持选择基础资源数量、租赁时长、接收地址及回调地址,再获取报价,确认费用后下单。修改任一参数会清除旧报价。 + +`quote`、`create` 新增可选参数 `resource_quantity`:表示选择的基础资源,省略采用套餐基础资源,必须是套餐基础资源的1~720整数倍。网络、资源类型不允许脱离绑定套餐切换。 + +## DURATION + +资源倍数 = 请求基础资源 / 套餐基础资源;租期倍数 = 请求租期 / 套餐基础租期。 + +最终资源 = 套餐基础资源 × 资源倍数 × 租期倍数。 +费用及供应商毛收入 = 对应套餐基础金额 × 资源倍数 × 租期倍数。 + +例如套餐65000 Energy、3600秒、3 USDT,请求resource_quantity=130000、duration_seconds=7200,最终资源260000 Energy,费用12 USDT。 + +## PER_ORDER + +资源数量和租期固定,不允许提高资源数量或延长租期后按原固定价格下单。 + +## 结果与重试 + +quote返回requested_resource_quantity(选择的基础资源)、resource_quantity(最终资源)、billing_mode和精确amount字符串。create/query返回的resource_quantity为最终资源。订单资源快照、交付目标和供应商收入均使用服务端计费结果。 + +create推荐带expected_amount=quote.amount。修改参数必须重新报价确认。同一商户单号重试时resource_quantity的数值及是否提交必须保持一致;改变数量不会覆盖原订单或重复冻结资金。订单成功后在我的订单查看履约结果,失败或未知结果保持原单号查询。 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalApiController.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalApiController.java index 5b3ed3e..d2d4845 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalApiController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalApiController.java @@ -100,6 +100,7 @@ public class RentalApiController { RentalOrders.validatePackage(product); Map 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"), "duration_seconds", price.get("duration_seconds"), "amount", amount(price, "sale_amount").toPlainString(), "resource_quantity", price.get("resource_quantity"), "currency", "USDT")); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOrders.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOrders.java index 6daf6b8..2b87a52 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOrders.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalOrders.java @@ -80,6 +80,10 @@ public class RentalOrders { if (request.containsKey("duration_seconds")) { hash = RentalCrypto.sha256(hash + ":" + number(request, "duration_seconds")); } + // 保留未提交资源数量的旧摘要;同单号不能更改资源数量重新冻结资金。 + if (request.containsKey("resource_quantity")) { + hash = RentalCrypto.sha256(hash + ":resource_quantity:" + number(request, "resource_quantity")); + } if (existing != null) { require(hash.equals(text(existing, "request_hash")), "同一商户订单号参数不一致"); return existing; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPricing.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPricing.java index 0420cbd..6537725 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPricing.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPricing.java @@ -22,14 +22,25 @@ public final class RentalPricing { require(base > 0 && duration > 0 && duration % base == 0 && ("PER_ORDER".equals(billingMode) || duration / base <= 720), "租赁时长必须为套餐基础租期的1至720倍"); BigDecimal units = "PER_ORDER".equals(billingMode) ? BigDecimal.ONE : BigDecimal.valueOf(duration / base); + // resource_quantity表示本次选择的基础资源,DURATION再乘租期倍数。 + long baseQuantity = number(product, "resource_quantity"); + long selectedQuantity = request.containsKey("resource_quantity") + ? number(request, "resource_quantity") : baseQuantity; + require(baseQuantity > 0 && selectedQuantity > 0 && selectedQuantity % baseQuantity == 0 + && selectedQuantity / baseQuantity <= 720, "资源数量必须为套餐基础资源的1至720倍"); + require(!"PER_ORDER".equals(billingMode) || (duration == base && selectedQuantity == baseQuantity), + "按次套餐的资源数量与租期固定"); + long resourceUnits = selectedQuantity / baseQuantity; Map result = new HashMap<>(product); + result.put("requested_resource_quantity", selectedQuantity); + result.put("billing_mode", billingMode); result.put("duration_seconds", duration); if ("DURATION".equals(billingMode)) { - long quantity = number(product, "resource_quantity"); - long multiplied = Math.multiplyExact(quantity, units.longValueExact()); + long multiplied = Math.multiplyExact(selectedQuantity, units.longValueExact()); require(multiplied > 0, "套餐资源数量超过允许范围"); result.put("resource_quantity", multiplied); } + units = units.multiply(BigDecimal.valueOf(resourceUnits)); result.put("sale_amount", amount(product, "sale_amount").multiply(units)); result.put("supplier_amount", amount(product, "supplier_amount").multiply(units)); require(amount(result, "sale_amount").precision() <= 30 diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalPricingTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalPricingTest.java index 8a97727..4eecc3e 100644 --- a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalPricingTest.java +++ b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalPricingTest.java @@ -15,7 +15,18 @@ public class RentalPricingTest { Map price = RentalPricing.price(product, map("duration_seconds", 7200)); assertEquals(new BigDecimal("6.000000"), amount(price, "sale_amount")); assertEquals(new BigDecimal("4.000000"), amount(price, "supplier_amount")); - assertEquals(65000, number(price, "resource_quantity")); + assertEquals(130000, number(price, "resource_quantity")); + Map larger = RentalPricing.price(product, + map("duration_seconds", 7200, "resource_quantity", 130000)); + assertEquals(260000, number(larger, "resource_quantity")); + assertEquals(new BigDecimal("12.000000"), amount(larger, "sale_amount")); + assertThrows(IllegalArgumentException.class, () -> RentalPricing.price(product, + map("resource_quantity", 65001))); + product.put("billing_mode", "PER_ORDER"); + assertThrows(IllegalArgumentException.class, () -> RentalPricing.price(product, + map("resource_quantity", 130000))); + assertEquals(new BigDecimal("3.000000"), amount(RentalPricing.price(product, map()), "sale_amount")); + product.put("billing_mode", "DURATION"); assertEquals(3600, number(product, "duration_seconds")); for (long duration : new long[] {0, -1, 3601, 3600L * 721}) { assertThrows(IllegalArgumentException.class,