修复多处问题

2026-06-29 02:56:13 +08:00
parent 80759f6793
commit efd4d03037
14 changed files with 386 additions and 204 deletions
@@ -127,6 +127,18 @@ public class PaymentNotifyServiceImpl implements PaymentNotifyService {
    }

    private Mono<Void> handleStoredCardRecharge(PaymentOrder order) {
+        String orderNo = order.getOrderNo();
+
+        return memberStoredCardRechargeRepository.findByOrderNo(orderNo)
+                .flatMap(existing -> {
+                    log.info("[PaymentNotify] 充值记录已存在，跳过重复处理, orderNo={}, status={}", orderNo, existing.getStatus());
+                    return Mono.<Void>empty();
+                })
+                .switchIfEmpty(Mono.defer(() -> doHandleStoredCardRecharge(order)))
+                .then();
+    }
+
+    private Mono<Void> doHandleStoredCardRecharge(PaymentOrder order) {
        String remark = order.getRemark();
        log.info("[PaymentNotify] 开始处理储值卡充值, orderNo={}, memberId={}, orderType={}, remark={}",
                order.getOrderNo(), order.getMemberId(), order.getOrderType(), remark);