diff --git a/src/main/java/com/example/demo/config/GlobalExceptionHandler.java b/src/main/java/com/example/demo/config/GlobalExceptionHandler.java index 0d64129..1fea8f5 100644 --- a/src/main/java/com/example/demo/config/GlobalExceptionHandler.java +++ b/src/main/java/com/example/demo/config/GlobalExceptionHandler.java @@ -211,7 +211,7 @@ public class GlobalExceptionHandler { sendFeishuAlert(e, "未预期异常: " + e.getClass().getName(), e.getMessage()); // 返回通用错误信息 - Result result = Result.error(new BusinessException("正在为您努力加载中...")); + Result result = Result.error(new BusinessException(e.getMessage())); return ResponseEntity.status(HttpStatus.OK).body(result); } diff --git a/src/main/java/com/example/demo/controller/Temporary/RedController.java b/src/main/java/com/example/demo/controller/Temporary/RedController.java index fb68368..f4dbf7f 100644 --- a/src/main/java/com/example/demo/controller/Temporary/RedController.java +++ b/src/main/java/com/example/demo/controller/Temporary/RedController.java @@ -55,15 +55,15 @@ public class RedController { @RequestMapping("/RedTest") public Result selectRedTest(@RequestBody AuditRequest request) throws Exception { try { - redService.checkRed(request.getPrice(),request.getLinkId()); - //redService.consumeRed(request.getLinkId()); + // redService.checkRed(request.getPrice(),request.getLinkId()); + redService.consumeRed(request.getLinkId()); } catch (Exception e) { return Result.error(e.getMessage()); //redService.checkRed(request.getPrice(), request.getLinkId()); } - return Result.success(redService.checkRed(request.getPrice(),request.getLinkId())); - // return Result.success(redService.consumeRed(request.getLinkId())); + // return Result.success(redService.checkRed(request.getPrice(),request.getLinkId())); + return Result.success(redService.consumeRed(request.getLinkId())); //return Result.success(redService.checkRed(request.getPrice(), request.getLinkId())); } diff --git a/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java index e69d0e3..69a87b7 100644 --- a/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java @@ -238,7 +238,7 @@ public class RedServiceImpl implements RedService { // 构造参数 String body = "{\"order_id\":\"" + linkId + "\",\"amount\":" + price.divideToIntegralValue(BigDecimal.valueOf(100)).intValue() + "}"; // 构建 HttpRequest - HttpRequest request = HttpRequest.newBuilder().uri(URI.create(BASE_URLProd+PATH_CHECK)) + HttpRequest request = HttpRequest.newBuilder().uri(URI.create(BASE_URL_Margen+PATH_CHECK)) .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(body)) .build(); @@ -298,9 +298,9 @@ public class RedServiceImpl implements RedService { public String consumeRed(String linkId) throws Exception { try { // 构造参数 - String body = "{\"order_id\":\"" + linkId + "}"; + String body = "{\"order_id\":\"" + linkId + "\"}"; // 构建 HttpRequest - HttpRequest request = HttpRequest.newBuilder() .uri(URI.create(BASE_URLProd+PATH_REFUND)) + HttpRequest request = HttpRequest.newBuilder() .uri(URI.create(BASE_URL_Margen+PATH_REFUND)) .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(body)) .build();