From f3cda2f965c26576898b40bd9752a57cc972def5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 09:16:27 +0000 Subject: [PATCH 1/5] Initial plan From 8a50cbd84dbc0cf15446a7ba11e5e54f3e93f0c5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 09:18:55 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E5=AD=97=E6=AE=B5=EF=BC=9AchannelOrderId=E3=80=81wxpa?= =?UTF-8?q?yOrderId=E3=80=81settTime=E3=80=81settState=E3=80=81platformFee?= =?UTF-8?q?Fen=E3=80=81cpsFeeFen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com> --- .../bean/xpay/WxMaXPayQueryOrderResponse.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 a0edf409bd..2d967ad0e1 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 @@ -61,5 +61,18 @@ public static class OrderInfo { @SerializedName("wxOrderId") private String wxOrderId; + @SerializedName("channel_order_id") + private String channelOrderId; //渠道单号，为用户微信支付详情页面上的商户单号 + @SerializedName("wxpay_order_id") + private String wxpayOrderId; //微信支付交易单号，为用户微信支付详情页面上的交易单号 + @SerializedName("sett_time") + private Integer settTime; //结算时间的秒级时间戳，大于0表示结算成功 + @SerializedName("sett_state") + private Integer settState; //结算状态 0-未开始结算 1-结算中 2-结算成功 3-待结算（与0相同） + @SerializedName("platform_fee_fen") + private Integer platformFeeFen; //虚拟支付技术服务费，单位为分；sett_state = 2时返回 + @SerializedName("cps_fee_fen") + private Integer cpsFeeFen; //公众号、视频号平台的cps服务费，单位为分；sett_state = 2时返回 + } } From c1eacb2eff59a8cb73619c8bc5a20fb989929cb1 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 10 Mar 2026 10:36:43 +0800 Subject: [PATCH 3/5] Update weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2d967ad0e1..346ab90e05 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 @@ -66,7 +66,7 @@ public static class OrderInfo { @SerializedName("wxpay_order_id") private String wxpayOrderId; //微信支付交易单号，为用户微信支付详情页面上的交易单号 @SerializedName("sett_time") - private Integer settTime; //结算时间的秒级时间戳，大于0表示结算成功 + private Long settTime; //结算时间的秒级时间戳，大于0表示结算成功 @SerializedName("sett_state") private Integer settState; //结算状态 0-未开始结算 1-结算中 2-结算成功 3-待结算（与0相同） @SerializedName("platform_fee_fen") From e7d3a12aa1eedaf5e7d1ae91927b412cb9caa4f2 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 10 Mar 2026 10:36:54 +0800 Subject: [PATCH 4/5] Update weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../wx/miniapp/bean/xpay/WxMaXPayQueryOrderResponse.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 346ab90e05..712f598857 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 @@ -70,9 +70,9 @@ public static class OrderInfo { @SerializedName("sett_state") private Integer settState; //结算状态 0-未开始结算 1-结算中 2-结算成功 3-待结算（与0相同） @SerializedName("platform_fee_fen") - private Integer platformFeeFen; //虚拟支付技术服务费，单位为分；sett_state = 2时返回 + private Long platformFeeFen; //虚拟支付技术服务费，单位为分；sett_state = 2时返回 @SerializedName("cps_fee_fen") - private Integer cpsFeeFen; //公众号、视频号平台的cps服务费，单位为分；sett_state = 2时返回 + private Long cpsFeeFen; //公众号、视频号平台的cps服务费，单位为分；sett_state = 2时返回 } } From 9974e09d735349c817447fb25165116c4c56ade9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Mar 2026 08:12:26 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B0=86=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B3=A8=E9=87=8A=E6=94=B9=E4=B8=BAJavadoc=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=B9=B6=E5=B0=86settTime/platformFeeFen/cps?= =?UTF-8?q?FeeFen=E7=B1=BB=E5=9E=8B=E7=BB=9F=E4=B8=80=E4=B8=BALong?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com> --- .../bean/xpay/WxMaXPayQueryOrderResponse.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 712f598857..13a980e11c 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 @@ -61,18 +61,24 @@ public static class OrderInfo { @SerializedName("wxOrderId") private String wxOrderId; + /** 渠道单号，为用户微信支付详情页面上的商户单号 */ @SerializedName("channel_order_id") - private String channelOrderId; //渠道单号，为用户微信支付详情页面上的商户单号 + private String channelOrderId; + /** 微信支付交易单号，为用户微信支付详情页面上的交易单号 */ @SerializedName("wxpay_order_id") - private String wxpayOrderId; //微信支付交易单号，为用户微信支付详情页面上的交易单号 + private String wxpayOrderId; + /** 结算时间的秒级时间戳，大于0表示结算成功 */ @SerializedName("sett_time") - private Long settTime; //结算时间的秒级时间戳，大于0表示结算成功 + private Long settTime; + /** 结算状态：0-未开始结算 1-结算中 2-结算成功 3-待结算（与0相同） */ @SerializedName("sett_state") - private Integer settState; //结算状态 0-未开始结算 1-结算中 2-结算成功 3-待结算（与0相同） + private Integer settState; + /** 虚拟支付技术服务费，单位为分；sett_state = 2时返回 */ @SerializedName("platform_fee_fen") - private Long platformFeeFen; //虚拟支付技术服务费，单位为分；sett_state = 2时返回 + private Long platformFeeFen; + /** 公众号、视频号平台的cps服务费，单位为分；sett_state = 2时返回 */ @SerializedName("cps_fee_fen") - private Long cpsFeeFen; //公众号、视频号平台的cps服务费，单位为分；sett_state = 2时返回 + private Long cpsFeeFen; } }