feat(miniapp): Add xpay_subscribe_ios_refund_query_notify event support #3974
+145
−0
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -464,6 +464,80 @@ public class WxMaMessage implements Serializable { | |||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String requestId; | ||||||||
|
|
||||||||
| // xpay_subscribe_ios_refund_query_notify iOS退款查询通知字段 | ||||||||
|
|
||||||||
| /** | ||||||||
| * 问询时间，Unix时间戳. | ||||||||
| * xpay_subscribe_ios_refund_query_notify | ||||||||
| */ | ||||||||
| @SerializedName("refund_time") | ||||||||
| @XStreamAlias("refund_time") | ||||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String refundTime; | ||||||||
|
Comment on lines
+475
to
+476
There was a problem hiding this comment. 这里的 refund_time 在文档中是 Unix 时间戳（数值语义），但当前用 String + XStreamCDataConverter 建模，会导致调用方需要自行解析且与本类里其他时间戳字段（如 ComplaintTime/RefundStartTimestamp 等 Long 类型）不一致。建议将 refundTime 改为 Long（或 Integer/Long 统一口径），并移除该字段上的 XStreamCDataConverter（数值字段通常不需要 CDATA converter），同时相应更新测试断言。
Suggested change
|
||||||||
|
|
||||||||
| /** | ||||||||
| * 该笔退款的订单时间（退款订单对应的交易时间），Unix时间戳. | ||||||||
| * xpay_subscribe_ios_refund_query_notify | ||||||||
| */ | ||||||||
| @SerializedName("order_time") | ||||||||
| @XStreamAlias("order_time") | ||||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String orderTime; | ||||||||
|
Comment on lines
+484
to
+485
There was a problem hiding this comment. order_time 同样是 Unix 时间戳字段，目前用 String 表达会弱化类型信息且与本类既有的 Long 时间戳字段不一致。建议将 orderTime 改为 Long，并去掉 XStreamCDataConverter（如果需要兼容字符串/数值两种 JSON 表达，可保留 Long 并依赖 Gson/XStream 的数值解析能力），同时调整对应测试。
Suggested change
|
||||||||
|
|
||||||||
| /** | ||||||||
| * Apple 支付票据号. | ||||||||
| * xpay_subscribe_ios_refund_query_notify | ||||||||
| */ | ||||||||
| @SerializedName("channel_bill") | ||||||||
| @XStreamAlias("channel_bill") | ||||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String channelBill; | ||||||||
|
|
||||||||
| /** | ||||||||
| * 应用的 Apple bundleid. | ||||||||
| * xpay_subscribe_ios_refund_query_notify | ||||||||
| */ | ||||||||
| @SerializedName("bundleid") | ||||||||
| @XStreamAlias("bundleid") | ||||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String bundleid; | ||||||||
|
|
||||||||
| /** | ||||||||
| * 道具 id. | ||||||||
| * xpay_subscribe_ios_refund_query_notify | ||||||||
| */ | ||||||||
| @SerializedName("product_id") | ||||||||
| @XStreamAlias("product_id") | ||||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String xpayProductId; | ||||||||
|
|
||||||||
| /** | ||||||||
| * 道具/代币数量. | ||||||||
| * xpay_subscribe_ios_refund_query_notify | ||||||||
| */ | ||||||||
| @SerializedName("p_count") | ||||||||
| @XStreamAlias("p_count") | ||||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String pCount; | ||||||||
|
Comment on lines
+520
to
+521
There was a problem hiding this comment. p_count 是数量字段（数值语义），目前用 String 建模不利于后续做数值比较/计算，也与本类中类似字段（如 RefundFee/RetryTimes 等 Integer）不一致。建议将 pCount 改为 Integer，并移除 XStreamCDataConverter，同时更新解析测试断言。
Suggested change
|
||||||||
|
|
||||||||
| /** | ||||||||
| * 用户请求退款的原因. | ||||||||
| * xpay_subscribe_ios_refund_query_notify | ||||||||
| */ | ||||||||
| @SerializedName("refund_request_reason") | ||||||||
| @XStreamAlias("refund_request_reason") | ||||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String refundRequestReason; | ||||||||
|
|
||||||||
| /** | ||||||||
| * 发货状态，0：未发货 1：已发货 2：发货中. | ||||||||
| * xpay_subscribe_ios_refund_query_notify | ||||||||
| */ | ||||||||
| @SerializedName("provide_status") | ||||||||
| @XStreamAlias("provide_status") | ||||||||
| @XStreamConverter(value = XStreamCDataConverter.class) | ||||||||
| private String provideStatus; | ||||||||
|
There was a problem hiding this comment. WxMaMessage.java:539 — The WeChat spec for Severity: medium Other Locations
🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.
Comment on lines
+538
to
+539
There was a problem hiding this comment. provide_status 表示枚举状态（0/1/2），建议用 Integer 而不是 String 来建模，避免调用方自行解析且与本类其它状态字段（如 retCode/teamType 等 Integer）保持一致；相应可移除 XStreamCDataConverter 并更新测试断言。
Suggested change
|
||||||||
|
|
||||||||
| /** | ||||||||
| * 不要直接使用这个字段， | ||||||||
| * 这个字段只是为了适配 SubscribeMsgPopupEvent SubscribeMsgChangeEvent SubscribeMsgSentEvent | ||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
仓库里小程序虚拟支付通知事件名已在 WxMaConstants.XPayNotifyEvent 中集中维护（含 xpay_refund_notify/xpay_complaint_notify 等）。这里单独在 WxConsts.EventType 新增一个 XPAY_* 常量会造成事件常量来源分散；建议要么把该事件也补充到 WxMaConstants.XPayNotifyEvent 并在 miniapp 场景统一使用它，要么在 WxConsts 中补齐同类 XPAY 通知常量以保持一致。