修复多处问题

2026-06-29 02:56:13 +08:00
parent 80759f6793
commit efd4d03037
14 changed files with 386 additions and 204 deletions
@@ -222,14 +222,15 @@ public class PaymentServiceImpl implements PaymentService {
                                if ("00000000".equals(respCode)) {
                                    if ("S".equals(transStat)) {
                                        if (!"SUCCESS".equals(order.getPayStatus())) {
-                                            log.info("[Huifu] 查询到支付成功，仅更新订单状态（业务处理由汇付异步回调触发）, orderNo={}", order.getOrderNo());
+                                            log.info("[Huifu] 查询到支付成功，更新订单状态并触发业务通知, orderNo={}", order.getOrderNo());
                                            order.setPayStatus("SUCCESS");
                                            order.setHfSeqId(String.valueOf(response.getOrDefault("hf_seq_id", order.getHfSeqId())));
                                            order.setPayTime(LocalDateTime.now());
                                            return paymentOrderRepository.save(order)
-                                                    .map(savedOrder -> {
+                                                    .flatMap(savedOrder -> {
                                                        log.info("[Huifu] 订单状态已更新为SUCCESS, orderNo={}", savedOrder.getOrderNo());
-                                                        return convertToResponse(savedOrder);
+                                                        return paymentNotifyService.notifyPaymentStatus(savedOrder.getOrderNo(), "SUCCESS", savedOrder.getMemberId())
+                                                                .thenReturn(convertToResponse(savedOrder));
                                                    });
                                        } else {
                                            log.info("[Huifu] 订单已处理过，跳过, orderNo={}", order.getOrderNo());