Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -465,32 +465,40 @@ public static class EventType {
/**
* 名称审核事件
*/
public static final String WXA_NICKNAME_AUDIT = "wxa_nickname_audit" ;
public static final String WXA_NICKNAME_AUDIT = "wxa_nickname_audit";
/**
*小程序违规记录事件
*/
public static final String WXA_ILLEGAL_RECORD= "wxa_illegal_record";
* 小程序违规记录事件
*/
public static final String WXA_ILLEGAL_RECORD = "wxa_illegal_record";
/**
*小程序申诉记录推送
*/
public static final String WXA_APPEAL_RECORD= "wxa_appeal_record";
* 小程序申诉记录推送
*/
public static final String WXA_APPEAL_RECORD = "wxa_appeal_record";
/**
* 隐私权限审核结果推送
*/
public static final String WXA_PRIVACY_APPLY= "wxa_privacy_apply";
public static final String WXA_PRIVACY_APPLY = "wxa_privacy_apply";
/**
* 类目审核结果事件推送
*/
public static final String WXA_CATEGORY_AUDIT= "wxa_category_audit";
public static final String WXA_CATEGORY_AUDIT = "wxa_category_audit";
/**
* 小程序微信认证支付成功事件
*/
public static final String WX_VERIFY_PAY_SUCC= "wx_verify_pay_succ";
public static final String WX_VERIFY_PAY_SUCC = "wx_verify_pay_succ";
/**
* 小程序微信认证派单事件
*/
public static final String WX_VERIFY_DISPATCH= "wx_verify_dispatch";
}
public static final String WX_VERIFY_DISPATCH = "wx_verify_dispatch";
/**
* 提醒需要上传发货信息事件:曾经发过货的小程序,订单超过48小时未发货时
*/
public static final String TRADE_MANAGE_REMIND_SHIPPING = "trade_manage_remind_shipping";
/**
* 订单完成发货时、订单结算时
*/
public static final String TRADE_MANAGE_ORDER_SETTLEMENT = "trade_manage_order_settlement";
}

/**
* 上传多媒体(临时素材)文件的类型.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,62 @@ public class WxMaMessage implements Serializable {
*/
private String context;

/**
* 微信支付订单号
*/
@XStreamAlias("transaction_id")
private String transactionId;
/**
* 商户号
*/
@XStreamAlias("merchant_id")
private String merchantId;
/**
* 子商户号
*/
@XStreamAlias("sub_merchant_id")
private String subMerchantId;
/**
* 商户订单号
*/
@XStreamAlias("merchant_trade_no")
private String merchantTradeNo;
/**
* 支付成功时间,秒级时间戳
*/
@XStreamAlias("pay_time")
private Long payTime;
/**
* 消息文本内容
*/
@XStreamAlias("msg")
private String msg;
/**
* 支付成功时间,秒级时间戳
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JavaDoc 注释错误:此字段为"发货时间"(shipped_time),但注释写成了"支付成功时间"。这与 payTime 字段的注释重复了。应改为"发货时间,秒级时间戳"或类似描述。

Suggested change
* 支付成功时间秒级时间戳
* 发货时间秒级时间戳

Copilot uses AI. Check for mistakes.
*/
@XStreamAlias("shipped_time")
private Long shippedTime;
/**
* 预计结算时间,秒级时间戳。发货时推送才有该字段
*/
@XStreamAlias("estimated_settlement_time")
private Long estimatedSettlementTime;
/**
* 确认收货方式:1. 手动确认收货;2. 自动确认收货。结算时推送才有该字段
*/
@XStreamAlias("confirm_receive_method")
private Integer confirmReceiveMethod;
/**
* 确认收货时间,秒级时间戳。结算时推送才有该字段
*/
@XStreamAlias("confirm_receive_time")
private Long confirmReceiveTime;
/**
* 订单结算时间,秒级时间戳。结算时推送才有该字段
*/
@XStreamAlias("settlement_time")
private Long settlementTime;
Comment on lines +260 to +314
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

缺少对新增发货信息字段的测试覆盖。建议在 WxMaMessageTest.java 中添加针对 TRADE_MANAGE_REMIND_SHIPPING 和 TRADE_MANAGE_ORDER_SETTLEMENT 事件的测试用例,验证这些新字段(transactionId, merchantId, subMerchantId, merchantTradeNo, payTime, msg, shippedTime, estimatedSettlementTime, confirmReceiveMethod, confirmReceiveTime, settlementTime)能够正确解析。可以参考现有的 testSubscribeMsgPopupEvent() 和 testFromXmlForOpenProductOrderPayEvent() 方法的测试模式。

Copilot uses AI. Check for mistakes.

/**
* 不要直接使用这个字段,
* 这个字段只是为了适配 SubscribeMsgPopupEvent SubscribeMsgChangeEvent SubscribeMsgSentEvent
Expand Down