skyline 2 лет назад
Родитель
Сommit
985915946d

+ 3 - 2
common/src/main/java/com/kym/common/handler/ResponseResultHandler.java

@@ -4,6 +4,7 @@ import com.kym.common.R;
 import com.kym.entity.enplus.response.EnResponse;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -34,8 +35,8 @@ public class ResponseResultHandler implements ResponseBodyAdvice {
     public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
                                   Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
 
-        // 响应给en+的信息不做处理
-        if (body instanceof R<?> || body instanceof EnResponse) {
+        // 响应给en+,微信的信息不做处理
+        if (body instanceof R<?> || body instanceof EnResponse || body instanceof ResponseEntity.BodyBuilder) {
             return body;
         } else if (body == null) {
             return R.success();

+ 3 - 2
miniapp/src/main/java/com/kym/miniapp/controller/PaymentController.java

@@ -7,6 +7,7 @@ import com.kym.service.wechat.WxPayService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -32,8 +33,8 @@ public class PaymentController {
     @SneakyThrows
     @PostMapping("/notify")
     @ResponseBody
-    R notify(HttpServletRequest request) {
-        return R.success(wxPayService.wxNotify(request));
+    ResponseEntity.BodyBuilder notify(HttpServletRequest request) {
+        return wxPayService.wxNotify(request);
     }