Skip to content

在JsapiResult中添加prepayId字段并提供静态工厂方法实现解耦 #3798

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.

Sign up for GitHub

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
binarywang merged 4 commits into from
Dec 21, 2025
+389 −16
Merged

在JsapiResult中添加prepayId字段并提供静态工厂方法实现解耦 #3798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba94732
Initial plan
Copilot Dec 5, 2025
2ab4caf
在JsapiResult中添加prepayId字段并提供静态工厂方法实现解耦
Copilot Dec 5, 2025
28e0c16
修复文档注释错误并添加测试用例
Copilot Dec 5, 2025
070a159
添加参数校验和提取重复代码为私有方法
Copilot Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 122 additions & 16 deletions ...-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3Result.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class WxPayUnifiedOrderV3Result implements Serializable {
/**
* <pre>
* 字段名：二维码链接（NATIVE支付 会返回）
* 变量名：h5_url
* 变量名：code_url
* 是否必填：是
* 类型：string[1,512]
* 描述：
Expand All @@ -81,6 +81,19 @@ public static class JsapiResult implements Serializable {
private String packageValue;
private String signType;
private String paySign;
/**
* <pre>
* 字段名：预支付交易会话标识
* 变量名：prepay_id
* 是否必填：否（用户可选存储）
* 类型：string[1,64]
* 描述：
* 预支付交易会话标识。用于后续接口调用中使用，该值有效期为2小时
* 此字段用于支持用户存储prepay_id，以便复用和重新生成支付签名
* 示例值：wx201410272009395522657a690389285100
* </pre>
*/
private String prepayId;

private String getSignStr() {
return String.format("%s\n%s\n%s\n%s\n", appId, timeStamp, nonceStr, packageValue);
Expand All @@ -106,30 +119,123 @@ private String getSignStr() {
}

public <T> T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey) {
String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
String nonceStr = SignUtils.genRandomStr();
switch (tradeType) {
case JSAPI:
JsapiResult jsapiResult = new JsapiResult();
jsapiResult.setAppId(appId).setTimeStamp(timestamp)
.setPackageValue("prepay_id=" + this.prepayId).setNonceStr(nonceStr)
//签名类型，默认为RSA，仅支持RSA。
.setSignType("RSA").setPaySign(SignUtils.sign(jsapiResult.getSignStr(), privateKey));
return (T) jsapiResult;
return (T) buildJsapiResult(this.prepayId, appId, privateKey);
case H5:
return (T) this.h5Url;
case APP:
AppResult appResult = new AppResult();
appResult.setAppid(appId).setPrepayId(this.prepayId).setPartnerId(mchId)
.setNoncestr(nonceStr).setTimestamp(timestamp)
//暂填写固定值Sign=WXPay
.setPackageValue("Sign=WXPay")
.setSign(SignUtils.sign(appResult.getSignStr(), privateKey));
return (T) appResult;
return (T) buildAppResult(this.prepayId, appId, mchId, privateKey);
case NATIVE:
return (T) this.codeUrl;
default:
throw new WxRuntimeException("不支持的支付类型");
}
}

/**
* <pre>
* 根据已有的prepay_id生成JSAPI支付所需的参数对象（解耦版本）
* 应用场景：
* 1. 用户已经通过createPartnerOrderV3或unifiedPartnerOrderV3获取了prepay_id
* 2. 用户希望存储prepay_id用于后续复用
* 3. 支付失败后，使用存储的prepay_id重新生成支付签名信息
*
* 使用示例：
* // 步骤1：创建订单并获取prepay_id
* WxPayUnifiedOrderV3Result result = wxPayService.unifiedPartnerOrderV3(TradeTypeEnum.JSAPI, request);
* String prepayId = result.getPrepayId();
* // 存储prepayId到数据库...
*
* // 步骤2：需要支付时，使用存储的prepay_id生成支付信息
* WxPayUnifiedOrderV3Result.JsapiResult payInfo = WxPayUnifiedOrderV3Result.getJsapiPayInfo(
* prepayId, appId, wxPayService.getConfig().getPrivateKey()
* );
* </pre>
*
* @param prepayId 预支付交易会话标识
* @param appId 应用ID
* @param privateKey 商户私钥，用于签名
* @return JSAPI支付所需的参数对象
*/
public static JsapiResult getJsapiPayInfo(String prepayId, String appId, PrivateKey privateKey) {
if (prepayId == null || appId == null || privateKey == null) {
throw new IllegalArgumentException("prepayId, appId 和 privateKey 不能为空");
}
return buildJsapiResult(prepayId, appId, privateKey);
}

/**
* <pre>
* 根据已有的prepay_id生成APP支付所需的参数对象（解耦版本）
* 应用场景：
* 1. 用户已经通过createPartnerOrderV3或unifiedPartnerOrderV3获取了prepay_id
* 2. 用户希望存储prepay_id用于后续复用
* 3. 支付失败后，使用存储的prepay_id重新生成支付签名信息
*
* 使用示例：
* // 步骤1：创建订单并获取prepay_id
* WxPayUnifiedOrderV3Result result = wxPayService.unifiedPartnerOrderV3(TradeTypeEnum.APP, request);
* String prepayId = result.getPrepayId();
* // 存储prepayId到数据库...
*
* // 步骤2：需要支付时，使用存储的prepay_id生成支付信息
* WxPayUnifiedOrderV3Result.AppResult payInfo = WxPayUnifiedOrderV3Result.getAppPayInfo(
* prepayId, appId, mchId, wxPayService.getConfig().getPrivateKey()
* );
* </pre>
*
* @param prepayId 预支付交易会话标识
* @param appId 应用ID
* @param mchId 商户号
* @param privateKey 商户私钥，用于签名
* @return APP支付所需的参数对象
*/
public static AppResult getAppPayInfo(String prepayId, String appId, String mchId, PrivateKey privateKey) {
if (prepayId == null || appId == null || mchId == null || privateKey == null) {
throw new IllegalArgumentException("prepayId, appId, mchId 和 privateKey 不能为空");
}
return buildAppResult(prepayId, appId, mchId, privateKey);
}

/**
* 构建JSAPI支付结果对象
*
* @param prepayId 预支付交易会话标识
* @param appId 应用ID
* @param privateKey 商户私钥，用于签名
* @return JSAPI支付所需的参数对象
*/
private static JsapiResult buildJsapiResult(String prepayId, String appId, PrivateKey privateKey) {
String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
String nonceStr = SignUtils.genRandomStr();
JsapiResult jsapiResult = new JsapiResult();
jsapiResult.setAppId(appId).setTimeStamp(timestamp)
.setPackageValue("prepay_id=" + prepayId).setNonceStr(nonceStr)
.setPrepayId(prepayId)
//签名类型，默认为RSA，仅支持RSA。
.setSignType("RSA").setPaySign(SignUtils.sign(jsapiResult.getSignStr(), privateKey));
return jsapiResult;
}

/**
* 构建APP支付结果对象
*
* @param prepayId 预支付交易会话标识
* @param appId 应用ID
* @param mchId 商户号
* @param privateKey 商户私钥，用于签名
* @return APP支付所需的参数对象
*/
private static AppResult buildAppResult(String prepayId, String appId, String mchId, PrivateKey privateKey) {
String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
String nonceStr = SignUtils.genRandomStr();
AppResult appResult = new AppResult();
appResult.setAppid(appId).setPrepayId(prepayId).setPartnerId(mchId)
.setNoncestr(nonceStr).setTimestamp(timestamp)
//暂填写固定值Sign=WXPay
.setPackageValue("Sign=WXPay")
.setSign(SignUtils.sign(appResult.getSignStr(), privateKey));
return appResult;
}
}
Loading