fix: finish received transfers after relabel settlement

2026-10-23 00:44:42 +08:00
parent 40d1b06312
commit 0fd523e740
2 changed files with 20 additions and 1 deletions
@@ -859,7 +859,8 @@ public class RelabelApplicationService implements WalletResultHandler {
        if ("COMPLETED".equals(application.getStatus())) return;
        if (!READY_FOR_OUTBOUND.equals(application.getStatus())
            || !"OUTBOUNDED".equals(application.getFulfillmentStatus())
-            || !Set.of("FROZEN", "NOT_REQUIRED").contains(application.getWalletStatus())) {
+            // PDA 完工已发起结算；转运收货只结束履约，不能拒绝已结算的原单或再次扣款。
+            || !Set.of("FROZEN", "NOT_REQUIRED", "SETTLE_PENDING", "SETTLED").contains(application.getWalletStatus())) {
            throw conflict("本票换标尚未完成出库或资金冻结");
        }
        List<LastlegOrder> linkedOrders = tailOrders(application);