From f3b8cf689ed0e9e4e61422f3a6cadf3560c1d2a8 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sat, 11 Apr 2026 21:40:19 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#3954=20=E3=80=90=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E3=80=91=E4=BF=AE=E5=A4=8DV3=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=A2=84=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B0packageVa?= =?UTF-8?q?lue=E5=AD=97=E6=AE=B5=E4=B8=8E=E5=BE=AE=E4=BF=A1=E5=AE=98?= =?UTF-8?q?=E6=96=B9API=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0@SerializedName("package")=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/ecommerce/TransactionsResult.java | 8 +++ .../result/CombineTransactionsResult.java | 8 +++ .../result/WxPayUnifiedOrderV3Result.java | 10 ++++ .../result/WxPayUnifiedOrderV3ResultTest.java | 59 ++++++++++++++++++- 4 files changed, 83 insertions(+), 2 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java index 818bc5ec9..8e11d859b 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java @@ -65,6 +65,10 @@ public class TransactionsResult implements Serializable { private String appId; private String timeStamp; private String nonceStr; + /** + * 由于package为java保留关键字，因此改为packageValue，序列化时会自动转换为package字段名 + */ + @SerializedName("package") private String packageValue; private String signType; private String paySign; @@ -80,6 +84,10 @@ public class TransactionsResult implements Serializable { private String appid; private String partnerid; private String prepayid; + /** + * 由于package为java保留关键字，因此改为packageValue，序列化时会自动转换为package字段名 + */ + @SerializedName("package") private String packageValue; private String noncestr; private String timestamp; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java index 34512a4d0..2ff718b81 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java @@ -73,6 +73,10 @@ public class CombineTransactionsResult implements Serializable { private String appId; private String timeStamp; private String nonceStr; + /** + * 由于package为java保留关键字，因此改为packageValue，序列化时会自动转换为package字段名 + */ + @SerializedName("package") private String packageValue; private String signType; private String paySign; @@ -89,6 +93,10 @@ public class CombineTransactionsResult implements Serializable { private String appid; private String partnerid; private String prepayid; + /** + * 由于package为java保留关键字，因此改为packageValue，序列化时会自动转换为package字段名 + */ + @SerializedName("package") private String packageValue; private String noncestr; private String timestamp; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3Result.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3Result.java index 5b60f3b52..e832f4c02 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3Result.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3Result.java @@ -78,6 +78,10 @@ public class WxPayUnifiedOrderV3Result implements Serializable { private String appId; private String timeStamp; private String nonceStr; + /** + * 由于package为java保留关键字，因此改为packageValue，序列化时会自动转换为package字段名 + */ + @SerializedName("package") private String packageValue; private String signType; private String paySign; @@ -106,8 +110,14 @@ public class WxPayUnifiedOrderV3Result implements Serializable { private static final long serialVersionUID = 5465773025172875110L; private String appid; + @SerializedName("partnerid") private String partnerId; + @SerializedName("prepayid") private String prepayId; + /** + * 由于package为java保留关键字，因此改为packageValue，序列化时会自动转换为package字段名 + */ + @SerializedName("package") private String packageValue; private String noncestr; private String timestamp; diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3ResultTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3ResultTest.java index 2e824b0e0..15775ed70 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3ResultTest.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3ResultTest.java @@ -2,6 +2,8 @@ package com.github.binarywang.wxpay.bean.result; import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum; import com.github.binarywang.wxpay.v3.util.SignUtils; +import com.google.gson.Gson; +import com.google.gson.JsonObject; import org.testng.Assert; import org.testng.annotations.Test; @@ -200,9 +202,62 @@ public class WxPayUnifiedOrderV3ResultTest { } /** - * 测试getJsapiPayInfo方法的空值验证 + * 测试JsapiResult序列化为JSON时，packageValue字段名应为package（兼容微信官方API要求） */ - @Test(expectedExceptions = IllegalArgumentException.class, + @Test + public void testJsapiResultJsonSerializationPackageFieldName() throws Exception { + String testPrepayId = "wx201410272009395522657a690389285100"; + String testAppId = "wx8888888888888888"; + KeyPair keyPair = generateKeyPair(); + PrivateKey privateKey = keyPair.getPrivate(); + + WxPayUnifiedOrderV3Result.JsapiResult jsapiResult = + WxPayUnifiedOrderV3Result.getJsapiPayInfo(testPrepayId, testAppId, privateKey); + + // 验证Java字段名仍为packageValue + Assert.assertEquals(jsapiResult.getPackageValue(), "prepay_id=" + testPrepayId); + + // 验证JSON序列化后字段名为package（微信官方要求） + Gson gson = new Gson(); + JsonObject jsonObject = gson.toJsonTree(jsapiResult).getAsJsonObject(); + Assert.assertTrue(jsonObject.has("package"), "JSON中应该包含package字段"); + Assert.assertFalse(jsonObject.has("packageValue"), "JSON中不应该包含packageValue字段"); + Assert.assertEquals(jsonObject.get("package").getAsString(), "prepay_id=" + testPrepayId); + } + + /** + * 测试AppResult序列化为JSON时，packageValue字段名应为package（兼容微信官方API要求） + */ + @Test + public void testAppResultJsonSerializationPackageFieldName() throws Exception { + String testPrepayId = "wx201410272009395522657a690389285100"; + String testAppId = "wx8888888888888888"; + String testMchId = "1900000109"; + KeyPair keyPair = generateKeyPair(); + PrivateKey privateKey = keyPair.getPrivate(); + + WxPayUnifiedOrderV3Result.AppResult appResult = + WxPayUnifiedOrderV3Result.getAppPayInfo(testPrepayId, testAppId, testMchId, privateKey); + + // 验证Java字段名仍为packageValue + Assert.assertEquals(appResult.getPackageValue(), "Sign=WXPay"); + + // 验证JSON序列化后字段名为package（微信官方要求） + Gson gson = new Gson(); + JsonObject jsonObject = gson.toJsonTree(appResult).getAsJsonObject(); + Assert.assertTrue(jsonObject.has("package"), "JSON中应该包含package字段"); + Assert.assertFalse(jsonObject.has("packageValue"), "JSON中不应该包含packageValue字段"); + Assert.assertEquals(jsonObject.get("package").getAsString(), "Sign=WXPay"); + // 验证JSON序列化后partnerid和prepayid字段名为全小写（微信官方要求） + Assert.assertTrue(jsonObject.has("partnerid"), "JSON中应该包含partnerid字段"); + Assert.assertFalse(jsonObject.has("partnerId"), "JSON中不应该包含驼峰的partnerId字段"); + Assert.assertEquals(jsonObject.get("partnerid").getAsString(), testMchId); + Assert.assertTrue(jsonObject.has("prepayid"), "JSON中应该包含prepayid字段"); + Assert.assertFalse(jsonObject.has("prepayId"), "JSON中不应该包含驼峰的prepayId字段"); + Assert.assertEquals(jsonObject.get("prepayid").getAsString(), testPrepayId); + } + + @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "prepayId, appId 和 privateKey 不能为空") public void testGetJsapiPayInfoWithNullPrepayId() { WxPayUnifiedOrderV3Result.getJsapiPayInfo(null, "appId", null);