|
|
@@ -7,7 +7,6 @@ import com.bex.staking.entity.StakingProfitJournal;
|
|
|
import com.bex.staking.enums.OrderStatus;
|
|
|
import com.bex.staking.enums.ProductType;
|
|
|
import com.bex.staking.enums.ProfitStatus;
|
|
|
-import com.bex.staking.grpc.MarketPriceClient;
|
|
|
import com.bex.staking.mapper.StakingOrderMapper;
|
|
|
import com.bex.staking.mapper.StakingProductMapper;
|
|
|
import com.bex.staking.mapper.StakingProfitJournalMapper;
|
|
|
@@ -85,7 +84,6 @@ public class SettlementEngine {
|
|
|
private final StakingProfitJournalMapper profitJournalMapper;
|
|
|
private final TransactionTemplate transactionTemplate;
|
|
|
private final TradeSettlementProducer tradeSettlementProducer;
|
|
|
- private final MarketPriceClient marketPriceClient;
|
|
|
|
|
|
// ==================== 纯逻辑:账本累加计划(供属性测试直接调用) ====================
|
|
|
|
|
|
@@ -242,20 +240,17 @@ public class SettlementEngine {
|
|
|
}
|
|
|
|
|
|
try {
|
|
|
- BigDecimal bexUSDTPrice = marketPriceClient.getBexUsdtPrice();
|
|
|
- BigDecimal profitUSDTAmount = plan.profitAmount().multiply(bexUSDTPrice).setScale(SCALE, ROUNDING);
|
|
|
-
|
|
|
- StakingProfitJournal journal = applyInTransaction(current, plan, bizDate, profitUSDTAmount);
|
|
|
- if (journal != null) {
|
|
|
+ Boolean applied = applyInTransaction(current, plan, bizDate);
|
|
|
+ if (Boolean.TRUE.equals(applied)) {
|
|
|
tradeSettlementProducer.sendTradeSettledEvent(
|
|
|
- journal.getId(),
|
|
|
+ current.getId(),
|
|
|
current.getUserId(),
|
|
|
- profitUSDTAmount,
|
|
|
- "USDT",
|
|
|
+ plan.profitAmount(),
|
|
|
+ "BEX",
|
|
|
"STAKING");
|
|
|
return SettleResult.success(orderNo);
|
|
|
}
|
|
|
- // journal == null:乐观锁版本冲突,重新查询后重试
|
|
|
+ // applied == false:乐观锁版本冲突,重新查询后重试
|
|
|
log.debug("订单结算乐观锁冲突, 第 {} 次重试, orderNo={}", attempt, orderNo);
|
|
|
} catch (DuplicateKeyException e) {
|
|
|
// 并发下唯一约束 uk_order_date 兜底:视为已结算跳过(需求 9.7)
|
|
|
@@ -281,17 +276,16 @@ public class SettlementEngine {
|
|
|
* 在单个本地事务内应用账本更新与流水插入(订单更新 → 流水插入,保证原子一致)。
|
|
|
*
|
|
|
* <p>先以乐观锁更新订单账本:{@code updateById} 携带 {@code version},返回 0 表示版本冲突,此时事务内
|
|
|
- * 未发生任何变更,直接返回 {@code null},由调用方重读后重试;返回 1 后插入收益流水
|
|
|
+ * 未发生任何变更,直接返回 {@code false},由调用方重读后重试;返回 1 后插入收益流水
|
|
|
* ({@link ProfitStatus#UNCLAIMED}),若命中唯一约束 {@code uk_order_date} 抛 {@link DuplicateKeyException},
|
|
|
* 触发整个事务回滚(订单账本更新一并撤销),由调用方按"已结算"幂等跳过处理。
|
|
|
*
|
|
|
* @param current 当前订单快照(提供 id 与 version)
|
|
|
* @param plan 账本累加计划
|
|
|
* @param bizDate 业务日期 {@code YYYYMMDD}
|
|
|
- * @param profitUsdtAmount 收益的USDT价值
|
|
|
- * @return 创建的收益流水实体;{@code null} 表示乐观锁版本冲突需重试
|
|
|
+ * @return {@code true} 表示成功落库;{@code false} 表示乐观锁版本冲突需重试
|
|
|
*/
|
|
|
- private StakingProfitJournal applyInTransaction(StakingOrder current, SettlementPlan plan, int bizDate, BigDecimal profitUsdtAmount) {
|
|
|
+ private Boolean applyInTransaction(StakingOrder current, SettlementPlan plan, int bizDate) {
|
|
|
return transactionTemplate.execute(status -> {
|
|
|
// 3.1 乐观锁更新订单账本(需求 9.5)
|
|
|
StakingOrder update = new StakingOrder();
|
|
|
@@ -305,13 +299,12 @@ public class SettlementEngine {
|
|
|
int rows = orderMapper.updateById(update);
|
|
|
if (rows == 0) {
|
|
|
// 版本冲突:事务内无变更,回滚(实为空操作)后由调用方重试
|
|
|
- return null;
|
|
|
+ return Boolean.FALSE;
|
|
|
}
|
|
|
|
|
|
// 3.2 插入收益流水(status=UNCLAIMED);uk_order_date 冲突将抛 DuplicateKeyException 触发回滚
|
|
|
- StakingProfitJournal journal = buildJournal(current, plan, bizDate, profitUsdtAmount);
|
|
|
- profitJournalMapper.insert(journal);
|
|
|
- return journal;
|
|
|
+ profitJournalMapper.insert(buildJournal(current, plan, bizDate));
|
|
|
+ return Boolean.TRUE;
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -324,16 +317,14 @@ public class SettlementEngine {
|
|
|
* @param order 订单(提供 orderNo / userId)
|
|
|
* @param plan 账本累加计划(提供本次派发金额)
|
|
|
* @param bizDate 业务日期 {@code YYYYMMDD}
|
|
|
- * @param profitUsdtAmount 收益的USDT价值
|
|
|
* @return 待插入的收益流水实体
|
|
|
*/
|
|
|
- private StakingProfitJournal buildJournal(StakingOrder order, SettlementPlan plan, int bizDate, BigDecimal profitUsdtAmount) {
|
|
|
+ private StakingProfitJournal buildJournal(StakingOrder order, SettlementPlan plan, int bizDate) {
|
|
|
return StakingProfitJournal.builder()
|
|
|
.journalNo(JOURNAL_NO_PREFIX + IdUtil.getSnowflakeNextIdStr())
|
|
|
.orderNo(order.getOrderNo())
|
|
|
.userId(order.getUserId())
|
|
|
.profitAmount(plan.profitAmount())
|
|
|
- .profitUsdtAmount(profitUsdtAmount)
|
|
|
.settleDate(bizDate)
|
|
|
.status(ProfitStatus.UNCLAIMED.getValue())
|
|
|
.createdAt(LocalDateTime.now())
|