From c09787831c5c49af86dfe808b7baf6131ea78408 Mon Sep 17 00:00:00 2001
From: hy001 <hy@hy001deMacBook-Pro.local>
Date: Mon, 20 Jul 2026 16:33:29 +0800
Subject: [PATCH] fix(withdrawal): preserve callback HTTP status

---
 ...WithdrawalReviewIntegrationController.java | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/integration/WithdrawalReviewIntegrationController.java b/rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/integration/WithdrawalReviewIntegrationController.java
index 8df795b1..c9508f82 100644
--- a/rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/integration/WithdrawalReviewIntegrationController.java
+++ b/rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/integration/WithdrawalReviewIntegrationController.java
@@ -1,6 +1,8 @@
 package com.red.circle.console.adapter.integration;
 
 import com.red.circle.console.app.service.app.user.UserBankBalanceBackService;
+import com.red.circle.framework.core.asserts.ResponseAssert;
+import com.red.circle.framework.core.response.ResponseErrorCode;
 import com.red.circle.wallet.inner.model.cmd.ApprovalMoneyApplyCmd;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -12,7 +14,6 @@ import java.util.List;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
 
 /**
  * hyapp-server 统一提现双审对 ChatApp3/Yumi 钱包的终态回调入口.
@@ -43,22 +43,24 @@ public class WithdrawalReviewIntegrationController {
       @RequestHeader(value = "Authorization", required = false) String authorization,
       @RequestBody @Valid DecisionRequest request) {
     verifyToken(authorization);
-    if (!"PASS".equals(request.getDecision()) && !"NOT_PASS".equals(request.getDecision())) {
-      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "invalid withdrawal decision");
-    }
-    if ("PASS".equals(request.getDecision())
-        && (request.getCredentialUrls() == null || request.getCredentialUrls().isEmpty())) {
-      // 财务通过必须带打款凭证；来源钱包再次校验，不能只依赖 Admin 前端门禁。
-      throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-          "withdrawal approval credential is required");
-    }
+    // Console 的全局异常处理器只识别框架 ResponseException；使用统一断言才能保留
+    // 401/400 HTTP 语义，避免 Admin 把确定性的鉴权或参数错误误当成 500 后持续重试。
+    ResponseAssert.isTrue(ResponseErrorCode.REQUEST_PARAMETER_ERROR,
+        "invalid withdrawal decision",
+        "PASS".equals(request.getDecision()) || "NOT_PASS".equals(request.getDecision()));
+    ResponseAssert.isTrue(ResponseErrorCode.REQUEST_PARAMETER_ERROR,
+        "withdrawal approval credential is required",
+        !"PASS".equals(request.getDecision())
+            || (request.getCredentialUrls() != null && !request.getCredentialUrls().isEmpty()));
 
     long sourceApplicationId;
     try {
       sourceApplicationId = Long.parseLong(request.getSourceApplicationId());
     } catch (NumberFormatException exception) {
-      throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-          "invalid source withdrawal application id", exception);
+      ResponseAssert.failure(ResponseErrorCode.REQUEST_PARAMETER_ERROR,
+          "invalid source withdrawal application id");
+      // failure 必然抛出 ResponseException；赋值只为满足 Java 的确定赋值检查。
+      sourceApplicationId = 0L;
     }
     userBankBalanceBackService.approvalMoneyApply(new ApprovalMoneyApplyCmd()
         .setId(sourceApplicationId)
@@ -76,10 +78,8 @@ public class WithdrawalReviewIntegrationController {
     boolean valid = !provided.isEmpty() && !expected.isEmpty()
         && MessageDigest.isEqual(provided.getBytes(StandardCharsets.UTF_8),
         expected.getBytes(StandardCharsets.UTF_8));
-    if (!valid) {
-      throw new ResponseStatusException(HttpStatus.UNAUTHORIZED,
-          "withdrawal callback authentication failed");
-    }
+    ResponseAssert.isTrue(ResponseErrorCode.UNAUTHORIZED,
+        "withdrawal callback authentication failed", valid);
   }
 
   @Data