统一收付通下单关单接口并更新收付通接口文档地址#4014
Merged
Merged
Conversation
这3个接口和普通服务商是一样的,对齐实现,减少代码冗余
There was a problem hiding this comment.
Pull request overview
该 PR 旨在将“电商收付通”下单/关单/查询/通知解析等能力统一收敛到 WxPayService 的 V3 通用接口与模型中,同时更新电商收付通相关接口文档链接,并将通知验签逻辑集中复用。
Changes:
- 统一收付通合单/服务商订单相关接口:
EcommerceServiceImpl由自实现改为委托WxPayService(V3 统一下单、查询、关单、通知解析)。 - 将通知验签能力上移到
WxPayService#verifyNotifySign,并在多个业务模块(支付分/营销/智慧商圈/电商)复用。 - 清理/移除旧的
bean.ecommerce下的下单/查询/通知/枚举等模型,替换为bean.request/bean.result/bean.notify下的统一模型,并更新测试用例与接口文档地址。
Reviewed changes
Copilot reviewed 29 out of 29 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImplTest.java | 测试用例改用统一的 V3 request/result/header 模型与接口名。 |
| weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BusinessCircleServiceImplTest.java | 测试用例切换到 bean.notify.SignatureHeader 新字段命名。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java | 新增 verifyNotifySign,为各模块提供统一通知验签入口。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java | SignatureHeader import 迁移到 bean.notify。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PartnerPayScoreSignPlanService.java | SignatureHeader import 迁移到 bean.notify。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PartnerPayScoreService.java | SignatureHeader import 迁移到 bean.notify。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MarketingFavorService.java | SignatureHeader import 迁移到 bean.notify。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java | 删除本地验签实现,改为调用 payService.verifyNotifySign。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PartnerPayScoreSignPlanServiceImpl.java | 删除本地验签实现,改为调用 payService.verifyNotifySign。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PartnerPayScoreServiceImpl.java | 删除本地验签实现,改为调用 payService.verifyNotifySign。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImpl.java | 删除本地验签实现,改为调用 payService.verifyNotifySign。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java | 电商收付通合单/服务商订单能力委托到 WxPayService 的统一 V3 方法。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BusinessCircleServiceImpl.java | 通知解析改为统一验签入口(并移除本地验签代码)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java | 实现并公开 verifyNotifySign;修正直连/服务商下单 URL 选择;补齐统一合单/服务商订单相关能力。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java | 电商收付通接口签名统一与文档链接更新;新增合单关单/改造查询与下单相关方法。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/BusinessCircleService.java | SignatureHeader import 迁移到 bean.notify。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/TradeTypeEnum.java | 统一交易类型 URL 字段含义(直连商户/服务商/合单)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayPartnerUnifiedOrderV3Request.java | 服务商统一下单结算信息新增 subsidy_amount 字段。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java | 删除旧电商收付通下单返回模型(由统一 V3 result 替代)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java | 删除旧通知头模型(迁移到 bean.notify.SignatureHeader)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java | 删除旧普通支付查询结果模型(由统一 V3 result 替代)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java | 删除旧普通支付下单请求模型(由统一 V3 request 替代)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsQueryRequest.java | 删除旧普通支付查询请求模型(由统一 V3 request 替代)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java | 删除旧普通支付通知解析结果模型(由统一 notify result 替代)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java | 删除旧普通支付关单请求模型(由统一 V3 request 替代)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java | 删除旧电商收付通交易类型枚举(统一到 bean.result.enums.TradeTypeEnum)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsResult.java | 删除旧合单查询结果模型(由统一 V3 result 替代)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java | 删除旧合单下单请求模型(由统一 V3 request 替代)。 |
| weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java | 删除旧合单通知解析结果模型(由统一 notify result 替代)。 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.