Skip to content

Commit 44346e4

Browse files
authored
🎨 #3956 【小程序】修复 WxMaXPayQueryOrderResponse 中 leftFee 和 wxOrderId 的 @SerializedName 错误
1 parent 62cbecd commit 44346e4

File tree

2 files changed

+85
-4
lines changed

2 files changed

+85
-4
lines changed

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,11 @@ public static class OrderInfo {
5656
@SerializedName("token")
5757
private String token;
5858

59-
@SerializedName("leftFee")
60-
private Long leftFee; //支付单类型时表示此单经过退款还剩余的金额,单位分
61-
@SerializedName("wxOrderId")
59+
/** 支付单类型时表示此单经过退款还剩余的金额,单位分 */
60+
@SerializedName("left_fee")
61+
private Long leftFee;
62+
/** 微信内部单号 */
63+
@SerializedName("wx_order_id")
6264
private String wxOrderId;
6365

6466
/** 渠道单号,为用户微信支付详情页面上的商户单号 */
@@ -70,7 +72,14 @@ public static class OrderInfo {
7072
/** 结算时间的秒级时间戳,大于0表示结算成功 */
7173
@SerializedName("sett_time")
7274
private Long settTime;
73-
/** 结算状态:0-未开始结算 1-结算中 2-结算成功 3-待结算(与0相同) */
75+
/**
76+
* 结算状态:
77+
* 0-未开始结算
78+
* 1-结算中
79+
* 2-结算成功
80+
* 3-待结算(与0相同)
81+
* 4-苹果iOS订单,Apple公司结算中
82+
*/
7483
@SerializedName("sett_state")
7584
private Integer settState;
7685
/** 虚拟支付技术服务费,单位为分;sett_state = 2时返回 */
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package cn.binarywang.wx.miniapp.bean.xpay;
2+
3+
import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
4+
import org.testng.annotations.Test;
5+
6+
import static org.testng.Assert.assertEquals;
7+
import static org.testng.Assert.assertNotNull;
8+
9+
/**
10+
* 验证 {@link WxMaXPayQueryOrderResponse} Gson 反序列化正确性的单元测试。
11+
*
12+
* <p>修复说明:{@link WxMaXPayQueryOrderResponse.OrderInfo} 中 {@code leftFee} 和 {@code wxOrderId}
13+
* 字段的 {@code @SerializedName} 使用了驼峰命名({@code "leftFee"}、{@code "wxOrderId"}),
14+
* 而微信小程序接口实际返回的 JSON key 为下划线分割形式({@code "left_fee"}、{@code "wx_order_id"}),
15+
* 导致这两个字段无法正确反序列化。
16+
*
17+
* @author GitHub Copilot
18+
*/
19+
public class WxMaXPayQueryOrderResponseTest {
20+
21+
private static final String JSON_WITH_SNAKE_CASE_KEYS =
22+
"{"
23+
+ "\"errcode\":0,"
24+
+ "\"errmsg\":\"ok\","
25+
+ "\"order\":{"
26+
+ "\"order_id\":\"order123\","
27+
+ "\"status\":1,"
28+
+ "\"left_fee\":500,"
29+
+ "\"wx_order_id\":\"wx_inner_order_456\","
30+
+ "\"sett_state\":4"
31+
+ "}"
32+
+ "}";
33+
34+
/**
35+
* 验证 left_fee(下划线形式)能正确反序列化到 leftFee 字段。
36+
*/
37+
@Test
38+
public void testLeftFeeDeserializedFromSnakeCaseKey() {
39+
WxMaXPayQueryOrderResponse response = WxMaGsonBuilder.create()
40+
.fromJson(JSON_WITH_SNAKE_CASE_KEYS, WxMaXPayQueryOrderResponse.class);
41+
42+
assertNotNull(response.getOrder(), "order 字段不应为 null");
43+
assertEquals(response.getOrder().getLeftFee(), Long.valueOf(500L),
44+
"left_fee 应正确反序列化为 leftFee 字段");
45+
}
46+
47+
/**
48+
* 验证 wx_order_id(下划线形式)能正确反序列化到 wxOrderId 字段。
49+
*/
50+
@Test
51+
public void testWxOrderIdDeserializedFromSnakeCaseKey() {
52+
WxMaXPayQueryOrderResponse response = WxMaGsonBuilder.create()
53+
.fromJson(JSON_WITH_SNAKE_CASE_KEYS, WxMaXPayQueryOrderResponse.class);
54+
55+
assertNotNull(response.getOrder(), "order 字段不应为 null");
56+
assertEquals(response.getOrder().getWxOrderId(), "wx_inner_order_456",
57+
"wx_order_id 应正确反序列化为 wxOrderId 字段");
58+
}
59+
60+
/**
61+
* 验证 sett_state = 4(苹果iOS订单)能正确反序列化。
62+
*/
63+
@Test
64+
public void testSettStateAppleOrderValue() {
65+
WxMaXPayQueryOrderResponse response = WxMaGsonBuilder.create()
66+
.fromJson(JSON_WITH_SNAKE_CASE_KEYS, WxMaXPayQueryOrderResponse.class);
67+
68+
assertNotNull(response.getOrder(), "order 字段不应为 null");
69+
assertEquals(response.getOrder().getSettState(), Integer.valueOf(4),
70+
"sett_state = 4 表示苹果iOS订单,Apple公司结算中");
71+
}
72+
}

0 commit comments

Comments
 (0)