diff --git a/payment-base-app/src/main/java/com/base/springcloud/aspect/interceptor/PayInterceptor.java b/payment-base-app/src/main/java/com/base/springcloud/aspect/interceptor/PayInterceptor.java index bd79915..a2cc346 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/aspect/interceptor/PayInterceptor.java +++ b/payment-base-app/src/main/java/com/base/springcloud/aspect/interceptor/PayInterceptor.java @@ -26,7 +26,8 @@ public class PayInterceptor implements HandlerInterceptor { // 根据注解拦截请求 if (handler instanceof HandlerMethod) loginRequired = ((HandlerMethod)handler).getMethodAnnotation(LoginRequired.class); - else return true; + else + return true; // 说明此方法没有LoginRequired注解 if (loginRequired == null) return true; diff --git a/payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java index 758bcfe..cbae2f9 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java +++ b/payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java @@ -2,6 +2,8 @@ package com.base.springcloud.controller; import com.base.springcloud.dto.NoticeReqDTO; import com.base.springcloud.dto.NoticeRspDTO; +import com.base.springcloud.dto.RefundNoticeReqDTO; +import com.base.springcloud.dto.RefundNoticeRspDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -23,4 +25,11 @@ public class NoticeController { return new NoticeRspDTO(); } + + @ApiOperation(value = "退款通知", notes = "退款结果通知接口") + @PostMapping("/returnNotice") + public RefundNoticeRspDTO returnNotice(@RequestBody RefundNoticeReqDTO noticeReqDTO) { + + return new RefundNoticeRspDTO(); + } } diff --git a/payment-base-app/src/main/java/com/base/springcloud/dto/NoticeReqDTO.java b/payment-base-app/src/main/java/com/base/springcloud/dto/NoticeReqDTO.java index 48859a2..11aeca7 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/dto/NoticeReqDTO.java +++ b/payment-base-app/src/main/java/com/base/springcloud/dto/NoticeReqDTO.java @@ -1,38 +1,7 @@ package com.base.springcloud.dto; import lombok.Data; -import org.springframework.web.multipart.MultipartFile; @Data public class NoticeReqDTO { - - /** - * 微信支付证书文件 - */ - private MultipartFile certFile; - - /** - * 公众号 - */ - private String appId; - - /** - * 商户私钥 - */ - private String apiKey; - - /** - * 证书序列号 - */ - private String serialNo; - - /** - * 商户号 - */ - private String mchId; - - /** - * 商户私钥 - */ - private String mchPrivateKey; } diff --git a/payment-base-app/src/main/java/com/base/springcloud/dto/NoticeRspDTO.java b/payment-base-app/src/main/java/com/base/springcloud/dto/NoticeRspDTO.java index 8edfd2f..8a74d91 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/dto/NoticeRspDTO.java +++ b/payment-base-app/src/main/java/com/base/springcloud/dto/NoticeRspDTO.java @@ -2,38 +2,7 @@ package com.base.springcloud.dto; import lombok.Data; -import java.io.File; - @Data public class NoticeRspDTO { - /** - * 微信支付证书文件 - */ - private File certFile; - - /** - * 公众号 - */ - private String appId; - - /** - * 商户私钥 - */ - private String apiKey; - - /** - * 证书序列号 - */ - private String serialNo; - - /** - * 商户号 - */ - private String mchId; - - /** - * 商户私钥 - */ - private String mchPrivateKey; } diff --git a/payment-base-app/src/main/java/com/base/springcloud/dto/RefundNoticeReqDTO.java b/payment-base-app/src/main/java/com/base/springcloud/dto/RefundNoticeReqDTO.java new file mode 100644 index 0000000..de2d5fd --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springcloud/dto/RefundNoticeReqDTO.java @@ -0,0 +1,8 @@ +package com.base.springcloud.dto; + +import lombok.Data; + +@Data +public class RefundNoticeReqDTO { + +} diff --git a/payment-base-app/src/main/java/com/base/springcloud/dto/RefundNoticeRspDTO.java b/payment-base-app/src/main/java/com/base/springcloud/dto/RefundNoticeRspDTO.java new file mode 100644 index 0000000..5f032cc --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springcloud/dto/RefundNoticeRspDTO.java @@ -0,0 +1,39 @@ +package com.base.springcloud.dto; + +import lombok.Data; + +import java.io.File; + +@Data +public class RefundNoticeRspDTO { + + /** + * 微信支付证书文件 + */ + private File certFile; + + /** + * 公众号 + */ + private String appId; + + /** + * 商户私钥 + */ + private String apiKey; + + /** + * 证书序列号 + */ + private String serialNo; + + /** + * 商户号 + */ + private String mchId; + + /** + * 商户私钥 + */ + private String mchPrivateKey; +}