目前还缺少,套餐绑定关系的逻辑,请单独一张表,并且引导添加user\_id系统用户绑定套餐逻辑,并且在创建租赁订单,自动关联应用对应user\_id的套餐信息。 另外给我一个脚本,创建3个套餐的脚本。
This commit is contained in:
1 parent
a83e1fef40
commit
0fd0450ddb
16 files changed
+299
-15
No files matched your search
@@ -72,9 +72,10 @@ public class RentalApiController {
|
||||
store.rows(
|
||||
"SELECT"
|
||||
+ " id,package_code,revision,name,network,resource_type,resource_quantity,duration_seconds,sale_amount"
|
||||
+ " FROM rent_package WHERE status='ACTIVE' AND network=? ORDER BY"
|
||||
+ " 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') ORDER BY"
|
||||
+ " id",
|
||||
network(input(data, "network", 16)));
|
||||
network(input(data, "network", 16)), number(app, "user_id"));
|
||||
return AjaxResult.success(products);
|
||||
}
|
||||
Map<String, Object> order;
|
||||
|
||||
@@ -34,6 +34,51 @@ public class RentalController {
|
||||
@org.springframework.beans.factory.annotation.Autowired
|
||||
private RentalReconciliation reconciliation;
|
||||
|
||||
@org.springframework.beans.factory.annotation.Autowired
|
||||
private RentalPackageBindings packageBindings;
|
||||
|
||||
/** 同一套餐管理权限负责授权;普通租赁用户不能自行添加绑定。 */
|
||||
@PostMapping("/package/bind")
|
||||
@PreAuthorize("@ss.hasPermi('rent:package:edit')")
|
||||
public AjaxResult bindPackage(@RequestBody Map<String, Object> body) {
|
||||
require(body.get("enabled") instanceof Boolean && body.get("is_default") instanceof Boolean,
|
||||
"必须明确绑定状态及是否默认");
|
||||
packageBindings.bind(number(body, "user_id"), number(body, "package_id"),
|
||||
Boolean.TRUE.equals(body.get("enabled")), Boolean.TRUE.equals(body.get("is_default")), user());
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@GetMapping("/package/bindings/{userId}")
|
||||
@PreAuthorize("@ss.hasPermi('rent:package:edit')")
|
||||
public AjaxResult userPackageBindings(@PathVariable long userId) {
|
||||
return AjaxResult.success(packageBindings.list(userId));
|
||||
}
|
||||
|
||||
@GetMapping("/package/bindings")
|
||||
@PreAuthorize("@ss.hasPermi('rent:portal:view')")
|
||||
public AjaxResult myPackageBindings() {
|
||||
return AjaxResult.success(packageBindings.list(user()));
|
||||
}
|
||||
|
||||
/** 用户选择器复用套餐管理权限,不额外开放系统用户管理权限。 */
|
||||
@GetMapping("/package/users")
|
||||
@PreAuthorize("@ss.hasPermi('rent:package:edit')")
|
||||
public AjaxResult packageUsers(@RequestParam(defaultValue = "") String keyword) {
|
||||
require(keyword.length() <= 100, "搜索内容过长");
|
||||
return AjaxResult.success(store.rows("SELECT user_id,user_name,nick_name FROM sys_user"
|
||||
+ " WHERE del_flag='0' AND status='0' AND (user_name LIKE ? OR nick_name LIKE ?)"
|
||||
+ " ORDER BY user_id LIMIT 30", "%" + keyword + "%", "%" + keyword + "%"));
|
||||
}
|
||||
|
||||
@GetMapping("/package/options")
|
||||
@PreAuthorize("@ss.hasPermi('rent:package:edit')")
|
||||
public AjaxResult packageOptions(@RequestParam(defaultValue = "") String keyword) {
|
||||
require(keyword.length() <= 100, "搜索内容过长");
|
||||
return AjaxResult.success(store.rows("SELECT id,name,network,resource_type,revision FROM rent_package"
|
||||
+ " WHERE status='ACTIVE' AND (name LIKE ? OR package_code LIKE ?) ORDER BY id DESC LIMIT 30",
|
||||
"%" + keyword + "%", "%" + keyword + "%"));
|
||||
}
|
||||
|
||||
public RentalController(
|
||||
RentalStore store,
|
||||
RentalProvisioning provisioning,
|
||||
|
||||
@@ -45,7 +45,20 @@ public class RentalOrders {
|
||||
String merchant = input(request, "merchant_order_no", 64);
|
||||
String receiver = input(request, "receiver_address", 64);
|
||||
address(receiver);
|
||||
long packageId = number(request, "package_id");
|
||||
Map<String, Object> existing = store.one(
|
||||
"SELECT * FROM rent_order WHERE app_id=? AND merchant_order_no=?", appId, merchant);
|
||||
long packageId;
|
||||
if (request.containsKey("package_id") && !text(request, "package_id").isEmpty()) {
|
||||
packageId = number(request, "package_id");
|
||||
} else if (existing != null) {
|
||||
// 默认套餐变更后,幂等重试仍关联原订单版本,不重新扣款。
|
||||
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");
|
||||
}
|
||||
String notify = text(request, "notify_url").trim();
|
||||
if (notify.isEmpty()) {
|
||||
notify = text(app, "notify_url");
|
||||
@@ -63,11 +76,6 @@ public class RentalOrders {
|
||||
receiver,
|
||||
"notify_url",
|
||||
notify)));
|
||||
Map<String, Object> existing =
|
||||
store.one(
|
||||
"SELECT * FROM rent_order WHERE app_id=? AND merchant_order_no=?",
|
||||
appId,
|
||||
merchant);
|
||||
if (existing != null) {
|
||||
require(hash.equals(text(existing, "request_hash")), "同一商户订单号参数不一致");
|
||||
return existing;
|
||||
@@ -75,6 +83,15 @@ public class RentalOrders {
|
||||
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' 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")),
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
package com.ruoyi.system.rental;
|
||||
|
||||
import static com.ruoyi.system.rental.RentalValues.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
/** 用户级套餐授权;客户端不能通过更换 app_id、user_id 或 package_id 越权购买。 */
|
||||
@Service
|
||||
public class RentalPackageBindings {
|
||||
private final RentalStore store;
|
||||
|
||||
public RentalPackageBindings(RentalStore store) {
|
||||
this.store = store;
|
||||
}
|
||||
|
||||
/** 管理员先选系统用户,再配置绑定;锁用户行使同用户默认套餐切换串行化。 */
|
||||
@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,
|
||||
"系统用户不存在或已停用");
|
||||
Map<String, Object> product = store.get("package", packageId, true);
|
||||
if (enabled) {
|
||||
require("ACTIVE".equals(text(product, "status")), "请先审核上架套餐再绑定用户");
|
||||
RentalOrders.validatePackage(product);
|
||||
}
|
||||
require(enabled || !makeDefault, "停用绑定不能设为默认");
|
||||
if (makeDefault) {
|
||||
store.execute("UPDATE rent_user_package SET default_slot=NULL,version=version+1,updated_at=? WHERE user_id=? AND default_slot=1",
|
||||
now(), userId);
|
||||
}
|
||||
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", makeDefault ? 1 : null);
|
||||
if (existing == null) {
|
||||
values.put("user_id", userId);
|
||||
values.put("package_id", packageId);
|
||||
values.put("created_by", actor);
|
||||
store.insert("user_package", values);
|
||||
} else {
|
||||
store.update("user_package", number(existing, "id"), values);
|
||||
}
|
||||
store.event("PACKAGE", packageId, "BIND_USER", actor,
|
||||
"用户ID=" + userId + ",状态=" + values.get("status") + ",默认=" + makeDefault);
|
||||
}
|
||||
|
||||
/** 显式安全列,供本人/管理员页面查看,不返回成本或供应商利润。 */
|
||||
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.network,p.resource_type,p.resource_quantity,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);
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@ public class RentalQueries {
|
||||
where = "r.user_id=?";
|
||||
break;
|
||||
case "package":
|
||||
where = "r.status='ACTIVE'";
|
||||
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')";
|
||||
break;
|
||||
case "wallet":
|
||||
where =
|
||||
@@ -65,9 +65,7 @@ public class RentalQueries {
|
||||
default:
|
||||
throw new IllegalArgumentException("该资源仅限运营查询");
|
||||
}
|
||||
if (!"package".equals(type)) {
|
||||
args.add(user);
|
||||
}
|
||||
args.add(user);
|
||||
if ("order".equals(type) || "credential".equals(type)) {
|
||||
args.add(user);
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@ public class RentalStore {
|
||||
"node",
|
||||
"wallet",
|
||||
"package",
|
||||
"user_package",
|
||||
"account",
|
||||
"order",
|
||||
"task",
|
||||
|
||||
@@ -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 ->
|
||||
|
||||
Reference in new issue
Block a user