From a8667547df0d3601e3280b20898c1f755f3d128c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 7 Apr 2026 09:12:49 +0000 Subject: [PATCH 1/3] Initial plan From 3b64bfb2bb8d1e93cce4956e95c54a335a9cc83f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 7 Apr 2026 09:16:24 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9AWxMaXPayQueryOrd?= =?UTF-8?q?erResponse=20=E4=B8=AD=20leftFee=20=E5=92=8C=20wxOrderId=20?= =?UTF-8?q?=E7=9A=84=20@SerializedName=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/binarywang/WxJava/sessions/cc05bdd4-0035-41f3-bc34-25b260888ce1 Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com> --- .../bean/xpay/WxMaXPayQueryOrderResponse.java | 17 +++-- .../xpay/WxMaXPayQueryOrderResponseTest.java | 72 +++++++++++++++++++ 2 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java index 13a980e11..f333a5830 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java @@ -56,9 +56,11 @@ public static class OrderInfo { @SerializedName("token") private String token; - @SerializedName("leftFee") - private Long leftFee; //支付单类型时表示此单经过退款还剩余的金额，单位分 - @SerializedName("wxOrderId") + /** 支付单类型时表示此单经过退款还剩余的金额，单位分 */ + @SerializedName("left_fee") + private Long leftFee; + /** 微信内部单号 */ + @SerializedName("wx_order_id") private String wxOrderId; /** 渠道单号，为用户微信支付详情页面上的商户单号 */ @@ -70,7 +72,14 @@ public static class OrderInfo { /** 结算时间的秒级时间戳，大于0表示结算成功 */ @SerializedName("sett_time") private Long settTime; - /** 结算状态：0-未开始结算 1-结算中 2-结算成功 3-待结算（与0相同） */ + /** + * 结算状态： + * 0-未开始结算 + * 1-结算中 + * 2-结算成功 + * 3-待结算（与0相同） + * 4-苹果iOS订单，Apple公司结算中 + */ @SerializedName("sett_state") private Integer settState; /** 虚拟支付技术服务费，单位为分；sett_state = 2时返回 */ diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java new file mode 100644 index 000000000..5bfea65a2 --- /dev/null +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java @@ -0,0 +1,72 @@ +package cn.binarywang.wx.miniapp.bean.xpay; + +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; +import org.testng.annotations.Test; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +/** + * 验证 {@link WxMaXPayQueryOrderResponse} GSON 反序列化正确性的单元测试。 + * + *

修复说明：{@link WxMaXPayQueryOrderResponse.OrderInfo} 中 {@code leftFee} 和 {@code wxOrderId} + * 字段的 {@code @SerializedName} 使用了驼峰命名（{@code "leftFee"}、{@code "wxOrderId"}）， + * 而微信小程序接口实际返回的 JSON key 为下划线分割形式（{@code "left_fee"}、{@code "wx_order_id"}）， + * 导致这两个字段无法正确反序列化。 + * + * @author GitHub Copilot + */ +public class WxMaXPayQueryOrderResponseTest { + + private static final String JSON_WITH_SNAKE_CASE_KEYS = + "{" + + "\"errcode\":0," + + "\"errmsg\":\"ok\"," + + "\"order\":{" + + "\"order_id\":\"order123\"," + + "\"status\":1," + + "\"left_fee\":500," + + "\"wx_order_id\":\"wx_inner_order_456\"," + + "\"sett_state\":4" + + "}" + + "}"; + + /** + * 验证 left_fee（下划线形式）能正确反序列化到 leftFee 字段。 + */ + @Test + public void testLeftFeeDeserializedFromSnakeCaseKey() { + WxMaXPayQueryOrderResponse response = WxMaGsonBuilder.create() + .fromJson(JSON_WITH_SNAKE_CASE_KEYS, WxMaXPayQueryOrderResponse.class); + + assertNotNull(response.getOrder(), "order 字段不应为 null"); + assertEquals(response.getOrder().getLeftFee(), Long.valueOf(500L), + "left_fee 应正确反序列化为 leftFee 字段"); + } + + /** + * 验证 wx_order_id（下划线形式）能正确反序列化到 wxOrderId 字段。 + */ + @Test + public void testWxOrderIdDeserializedFromSnakeCaseKey() { + WxMaXPayQueryOrderResponse response = WxMaGsonBuilder.create() + .fromJson(JSON_WITH_SNAKE_CASE_KEYS, WxMaXPayQueryOrderResponse.class); + + assertNotNull(response.getOrder(), "order 字段不应为 null"); + assertEquals(response.getOrder().getWxOrderId(), "wx_inner_order_456", + "wx_order_id 应正确反序列化为 wxOrderId 字段"); + } + + /** + * 验证 sett_state = 4（苹果iOS订单）能正确反序列化。 + */ + @Test + public void testSettStateAppleOrderValue() { + WxMaXPayQueryOrderResponse response = WxMaGsonBuilder.create() + .fromJson(JSON_WITH_SNAKE_CASE_KEYS, WxMaXPayQueryOrderResponse.class); + + assertNotNull(response.getOrder(), "order 字段不应为 null"); + assertEquals(response.getOrder().getSettState(), Integer.valueOf(4), + "sett_state = 4 表示苹果iOS订单，Apple公司结算中"); + } +} From 43af097343891811db2e1c40c5906d7970b4775b Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 11 Apr 2026 17:28:48 +0800 Subject: [PATCH 3/3] Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java index 5bfea65a2..ab1f42435 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponseTest.java @@ -7,7 +7,7 @@ import static org.testng.Assert.assertNotNull; /** - * 验证 {@link WxMaXPayQueryOrderResponse} GSON 反序列化正确性的单元测试。 + * 验证 {@link WxMaXPayQueryOrderResponse} Gson 反序列化正确性的单元测试。 * *

修复说明：{@link WxMaXPayQueryOrderResponse.OrderInfo} 中 {@code leftFee} 和 {@code wxOrderId} * 字段的 {@code @SerializedName} 使用了驼峰命名（{@code "leftFee"}、{@code "wxOrderId"}），