yeg
2026-09-14 61e873aada7f8c55ccebb4c5fdf93ec21eb5fffe
talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantWorkController.java
@@ -144,13 +144,17 @@
      return ApiResponse.success(merchantVerificationService.scan(principal, request));
   }
   @PostMapping("/verification/confirm")
   public ApiResponse<Map<String, Object>> confirmVerification(
   /**
    * 免费入住券核销。涉及支付的订单核销走 {@code POST /orders/{orderNo}/verify}:
    * 核销要写记录并确认延迟入账的资金,与不涉及支付的免费入住券是两条不同的线。
    */
   @PostMapping("/verification/free-stay/confirm")
   public ApiResponse<Map<String, Object>> confirmFreeStayVerification(
         @RequestAttribute(MerchantAuthService.PRINCIPAL_ATTRIBUTE) MerchantPrincipal principal,
         @Valid @RequestBody VerificationConfirmRequest request,
         @RequestHeader(value = "X-Idempotency-Key", required = false) String idempotencyKey
   ) {
      return ApiResponse.success(merchantVerificationService.confirm(principal, request, idempotencyKey));
      return ApiResponse.success(merchantVerificationService.confirmFreeStay(principal, request, idempotencyKey));
   }
   @GetMapping("/manual-consumptions/{verificationId}")