建议统一成“收益结算 + 提现付款” 按建议的逻辑帮我实现。

This commit is contained in:
lu7213 committed 2026-11-03 02:48:03 -05:00
1 parent 1151dc2535
commit be6ac23844
18 files changed
+352 -16

No files matched your search

@@ -25,6 +25,18 @@ public class RentSettlement extends BaseEntity
@Excel(name = "结算单号")
private String settlementNo;
/** INTERNAL_TRANSFER为收益入账;LEGACY_PAYOUT仅处理升级前付款单。 */
@Excel(name = "结算模式")
private String settlementMode;
/** 内部结算完成时间,与历史链上付款时间分开记录。 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date settledAt;
public String getSettlementMode() { return settlementMode; }
public void setSettlementMode(String settlementMode) { this.settlementMode = settlementMode; }
public Date getSettledAt() { return settledAt; }
public void setSettledAt(Date settledAt) { this.settledAt = settledAt; }
/** 供应商rent_account.id */
@Excel(name = "供应商rent_account.id")
private Long accountId;
@@ -26,6 +26,18 @@ public class RentSettlementPlus implements Serializable
/** 结算单号 */
@Excel(name = "结算单号")
private String settlementNo;
/** INTERNAL_TRANSFER为收益入账;LEGACY_PAYOUT仅处理升级前付款单。 */
@Excel(name = "结算模式")
private String settlementMode;
/** 内部结算完成时间,与历史链上付款时间分开记录。 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date settledAt;
public String getSettlementMode() { return settlementMode; }
public void setSettlementMode(String settlementMode) { this.settlementMode = settlementMode; }
public Date getSettledAt() { return settledAt; }
public void setSettledAt(Date settledAt) { this.settledAt = settledAt; }
/** 供应商rent_account.id */
@Excel(name = "供应商rent_account.id")
private Long accountId;
@@ -362,6 +362,8 @@ public class RentalController {
Map<String, Object> row = store.get("settlement", id, false),
account = store.get("account", number(row, "account_id"), false);
Map<String, Object> authorization;
require("LEGACY_PAYOUT".equals(text(row, "settlement_mode")),
"收益结算不接受链上付款登记,请使用提现功能");
try {
authorization =
new com.fasterxml.jackson.databind.ObjectMapper()
@@ -209,6 +209,15 @@ public class RentalOrders {
log.info("地址上链幂等命中 orderId={} network={}", existing.get("id"), network);
return existing;
}
// 跨应用、跨用户检查;人工核对仍可能已广播,不能视为可重新下单。
Map<String, Object> pending = store.one("SELECT id FROM rent_order WHERE network=?"
+ " AND receiver_address=? AND order_type='ADDRESS_ONCHAIN'"
+ " AND status NOT IN ('SUCCESS','FAILED','CANCELLED') LIMIT 1", network, receiver);
if (pending != null) {
log.warn("地址上链重复下单已拒绝 network={} receiver={} pendingOrderId={} userId={}",
network, receiver, pending.get("id"), user);
throw new IllegalArgumentException("该地址在当前网络已有待处理的上链订单,请等待原订单完成");
}
Map<String, Object> price = onchain.quote(request);
// 在任何账户创建、订单写入和资金冻结前查询最新链上状态;RPC未知时直接中止。
// 必须位于原单幂等返回之后,已成功激活的原订单仍可安全重试和查询。
@@ -234,7 +243,19 @@ public class RentalOrders {
"status", "WAITING", "payer_account_id", account.get("id"), "fund_status", "HELD",
"dispatch_deadline", after(300), "reclaim_status", "NOT_REQUIRED",
"notify_url", notify.isEmpty() ? null : notify);
long orderId = store.insert("order", order);
long orderId;
try {
// 数据库唯一索引兜底,防止不同应用或服务实例同时通过上面的预检查。
orderId = store.insert("order", order);
} catch (org.springframework.dao.DuplicateKeyException exception) {
if (exception.getMostSpecificCause().getMessage() != null
&& exception.getMostSpecificCause().getMessage().toLowerCase(java.util.Locale.ROOT)
.contains("uk_order_onchain_pending")) {
log.warn("地址上链并发重复下单已拒绝 network={} receiver={} userId={}", network, receiver, user);
throw new IllegalArgumentException("该地址在当前网络已有待处理的上链订单,请等待原订单完成");
}
throw exception;
}
order.put("id", orderId);
funds.hold(order);
log.info("地址上链分账已锁定 orderId={} platformPercent={} platformFeeUsdt={} supplierNetUsdt={}",
@@ -10,7 +10,10 @@ import java.util.*;
/** 人工退款及结算审批;审批者与发起者分离,付款未知绝不释放来源。 */
@Service
@lombok.extern.slf4j.Slf4j
public class RentalReviews {
/** 新单仅内部划转;历史单继续按原付款授权处理,禁止混用两种记账方式。 */
private static final String INTERNAL_TRANSFER = "INTERNAL_TRANSFER";
private final RentalStore store;
private final RentalFunds funds;
private final RentalOrders orders;
@@ -202,6 +205,9 @@ public class RentalReviews {
for (long orderId : sorted) {
Map<String, Object> order = store.get("order", orderId, true);
require("CHARGED".equals(text(order, "fund_status")), "来源订单尚未确认收入");
require("SUCCESS".equals(text(order, "status")), "仅履约成功订单允许收益结算");
require(store.one("SELECT id FROM rent_settlement_item WHERE order_id=? AND active_slot=1", orderId)
== null, "来源订单已被结算占用或已结算");
long current = number(order, "supplier_account_id");
require(account == null || account == current, "只允许同一供应商同网络的来源");
account = current;
@@ -225,6 +231,8 @@ public class RentalReviews {
total,
"status",
"PENDING",
"settlement_mode",
INTERNAL_TRANSFER,
"created_by",
actor));
for (Map<String, Object> source : sources) {
@@ -233,6 +241,8 @@ public class RentalReviews {
store.insert("settlement_item", source);
}
store.event("SETTLEMENT", id, "CREATE", actor, "占用订单净应收来源");
log.info("收益结算单创建 settlementId={} accountId={} amountUsdt={} sourceCount={} actorId={} mode={}",
id, account, total, sorted.size(), actor, INTERNAL_TRANSFER);
return id;
}
@@ -240,6 +250,12 @@ public class RentalReviews {
public Map<String, Object> transition(long id, String action, long actor, String reason) {
Map<String, Object> row = store.get("settlement", id, true);
String state = text(row, "status");
log.info("结算操作检查 settlementId={} mode={} state={} action={} actorId={}",
id, text(row, "settlement_mode"), state, action, actor);
if (INTERNAL_TRANSFER.equals(text(row, "settlement_mode"))) {
return internalSettlement(row, action, actor, reason);
}
require("LEGACY_PAYOUT".equals(text(row, "settlement_mode")), "结算模式无效,请检查数据库升级");
if ("approve".equals(action)) {
require("PENDING".equals(state) && number(row, "created_by") != actor, "审批须职责分离");
store.update(
@@ -279,10 +295,67 @@ public class RentalReviews {
return store.get("settlement", id, false);
}
/**
* 调用方已锁结算单。审批、来源核对、余额划转及审计在同一事务提交。
* SETTLED不代表对外付款;来源占位永久保留,之后仅可从可用余额申请提现。
*/
private Map<String, Object> internalSettlement(Map<String, Object> row, String action, long actor, String reason) {
long id = number(row, "id");
String state = text(row, "status");
if ("approve".equals(action)) {
if ("SETTLED".equals(state)) {
log.info("收益结算审批幂等返回 settlementId={} actorId={}", id, actor);
return row;
}
require("PENDING".equals(state) && number(row, "created_by") != actor, "审批须职责分离且结算单待审核");
List<Map<String, Object>> items = store.rows(
"SELECT * FROM rent_settlement_item WHERE settlement_id=? ORDER BY order_id", id);
require(!items.isEmpty(), "结算来源不能为空");
BigDecimal total = ZERO;
for (Map<String, Object> item : items) {
Map<String, Object> order = store.get("order", number(item, "order_id"), true);
BigDecimal net = amount(order, "supplier_net_amount")
.subtract(amount(order, "supplier_reversed_amount"))
.add(amount(order, "supplier_fee_returned_amount"));
require(number(item, "active_slot") == 1 && "CHARGED".equals(text(order, "fund_status"))
&& "SUCCESS".equals(text(order, "status"))
&& number(order, "supplier_account_id") == number(row, "account_id")
&& net.signum() > 0 && net.compareTo(amount(item, "amount")) == 0,
"来源订单状态或净应收已变更,请拒绝后重新创建结算单");
total = total.add(net);
}
require(total.compareTo(amount(row, "amount")) == 0, "结算明细金额不一致");
Map<String, Object> account = store.get("account", number(row, "account_id"), true);
require("ACTIVE".equals(text(account, "status")), "供应商账户已冻结,暂不能结算");
funds.post(number(row, "account_id"), "INCOME_SETTLE:" + id, "INCOME_SETTLE",
total, ZERO, total.negate(), ZERO, null, id, null, actor, null,
"收益结算转入可用余额:" + reason);
store.update("settlement", id, map("status", "SETTLED", "approved_by", actor,
"settled_at", now(), "remark", reason));
store.event("SETTLEMENT", id, "INCOME_SETTLE", actor, reason);
log.info("收益结算完成 settlementId={} accountId={} amountUsdt={} actorId={} sourceCount={}",
id, row.get("account_id"), total, actor, items.size());
} else if ("reject".equals(action)) {
if ("REJECTED".equals(state)) {
return row;
}
require("PENDING".equals(state) && number(row, "created_by") != actor, "只能由其他审批人拒绝待审收益结算单");
store.update("settlement", id, map("status", "REJECTED", "approved_by", actor, "remark", reason));
store.execute("UPDATE rent_settlement_item SET active_slot=NULL,version=version+1,updated_at=? WHERE settlement_id=?", now(), id);
store.event("SETTLEMENT", id, "REJECT", actor, reason);
log.info("收益结算拒绝并释放来源 settlementId={} actorId={}", id, actor);
} else {
log.warn("收益结算拒绝旧付款操作 settlementId={} action={} actorId={}", id, action, actor);
throw new IllegalArgumentException("收益结算只支持审核入账或拒绝;对外付款请使用提现功能");
}
return store.get("settlement", id, false);
}
/** 由链上只读服务独立核对付款后调用;不接受前端的verified=true作为依据。 */
@Transactional(rollbackFor = Exception.class)
public void paid(long id, String reference, String evidence, long actor) {
Map<String, Object> row = store.get("settlement", id, true);
require("LEGACY_PAYOUT".equals(text(row, "settlement_mode")), "收益结算不能登记链上付款,请通过提现付款");
if ("PAID".equals(text(row, "status"))) {
require(reference.equals(text(row, "payment_reference")), "付款凭据冲突");
return;
@@ -7,7 +7,6 @@ import org.springframework.jdbc.support.GeneratedKeyHolder;
import org.springframework.stereotype.Repository;
import java.sql.PreparedStatement;
import java.sql.Statement;
import java.util.*;
/** 租赁事务仓储。动态标识符只接受内部白名单,业务值全部使用占位符。 行锁由调用方事务持有;RPC必须在事务外执行,避免占用数据库连接等待链上响应。 */
@@ -93,7 +92,8 @@ public class RentalStore {
jdbc.update(
connection -> {
PreparedStatement ps =
connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
// 只读取自增主键,避免生成列也被驱动返回为 generated keys。
connection.prepareStatement(sql, new String[] {"id"});
int index = 1;
for (Object value : values.values()) {
ps.setObject(index++, value);