目前还缺少,套餐绑定关系的逻辑,请单独一张表,并且引导添加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
@@ -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")),
|
||||
|
||||
Reference in new issue
Block a user