-
-
Notifications
You must be signed in to change notification settings - Fork 8.9k
服务商模式URL修改，增加服务商模式关闭订单方法 #3063
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
服务商模式URL修改，增加服务商模式关闭订单方法 #3063
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
61 changes: 61 additions & 0 deletions
61
...c/main/java/com/github/binarywang/wxpay/bean/request/WxPayPartnerOrderCloseV3Request.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package com.github.binarywang.wxpay.bean.request; | ||
|
|
||
| import com.google.gson.annotations.SerializedName; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.experimental.Accessors; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| /** | ||
| * 服务商关闭订单请求对象类 | ||
| * 文档见：https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_1_3.shtml | ||
| * | ||
| * @author Guo Shuai | ||
| * @version 1.0 | ||
| * @date 2023/3/2 | ||
| */ | ||
| @Data | ||
| @NoArgsConstructor | ||
| @Accessors(chain = true) | ||
| public class WxPayPartnerOrderCloseV3Request implements Serializable { | ||
| private static final long serialVersionUID = 1L; | ||
| /** | ||
| * <pre> | ||
| * 字段名：服务商商户号 | ||
| * 变量名：sp_mchid | ||
| * 是否必填：是 | ||
| * 类型：string[1,32] | ||
| * 描述： | ||
| * 服务商商户号，由微信支付生成并下发。 | ||
| * 示例值：1230000109 | ||
| * </pre> | ||
| */ | ||
| @SerializedName(value = "sp_mchid") | ||
| private String spMchId; | ||
| /** | ||
| * <pre> | ||
| * 字段名：特约商户商户号 | ||
| * 变量名：sp_mchid | ||
| * 是否必填：是 | ||
| * 类型：string[1,32] | ||
| * 描述： | ||
| * 特约商户商户号，由微信支付生成并下发。 | ||
| * 示例值：1230000109 | ||
| * </pre> | ||
| */ | ||
| @SerializedName(value = "sub_mchid") | ||
| private String subMchId; | ||
| /** | ||
| * <pre> | ||
| * 字段名：商户订单号 | ||
| * 变量名：out_trade_no | ||
| * 是否必填：是 | ||
| * 类型：string[6,32] | ||
| * 描述： | ||
| * 商户系统内部订单号，只能是数字、大小写字母_-*且在同一个商户号下唯一 | ||
| * 示例值：1217752501201407033233368018 | ||
| * </pre> | ||
| */ | ||
| private transient String outTradeNo; | ||
| } |
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
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
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
40 changes: 40 additions & 0 deletions
40
...pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/PartnerTradeTypeEnum.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package com.github.binarywang.wxpay.bean.result.enums; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
|
|
||
| /** | ||
| * 支付方式 | ||
| * | ||
| * @author thinsstar | ||
| */ | ||
| @Getter | ||
| @AllArgsConstructor | ||
| public enum PartnerTradeTypeEnum { | ||
| /** | ||
| * APP | ||
| */ | ||
| APP("/v3/pay/partner/transactions/app", "/v3/combine-transactions/app"), | ||
| /** | ||
| * JSAPI 或 小程序 | ||
| */ | ||
| JSAPI("/v3/pay/partner/transactions/jsapi", "/v3/combine-transactions/jsapi"), | ||
| /** | ||
| * NATIVE | ||
| */ | ||
| NATIVE("/v3/pay/partner/transactions/native", "/v3/combine-transactions/native"), | ||
| /** | ||
| * H5 | ||
| */ | ||
| H5("/v3/pay/partner/transactions/h5", "/v3/combine-transactions/h5"); | ||
|
|
||
| /** | ||
| * 单独下单url | ||
| */ | ||
| private final String partnerUrl; | ||
|
|
||
| /** | ||
| * 合并下单url | ||
| */ | ||
| private final String combineUrl; | ||
| } |
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
THREAD_SAFETY_VIOLATION: Read/Write race. Non-private method
BaseWxPayServiceImpl.unifiedPartnerOrderV3(...)indirectly reads without synchronization fromthis.configMap. Potentially races with write in methodBaseWxPayServiceImpl.addConfig(...).Reporting because another access to the same memory occurs on a background thread, although this access may not.
ℹ️ Expand to see all @sonatype-lift commands
You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.
@sonatype-lift ignore@sonatype-lift ignoreall@sonatype-lift exclude <file|issue|path|tool>file|issue|path|toolfrom Lift findings by updating your config.toml fileNote: When talking to LiftBot, you need to refresh the page to see its response.
Click here to add LiftBot to another repo.