From c777dc32a89d9dbb054bfc5d49addecb0af4c4f4 Mon Sep 17 00:00:00 2001
From: buaazyl <dev@zhangyl.com>
Date: Wed, 10 Dec 2025 10:07:36 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#3799=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E3=80=91=E5=8F=91=E8=B4=A7=E4=BF=A1=E6=81=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=E8=A1=A5=E5=85=85=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7=E5=92=8C=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E5=AE=8C=E6=95=B4=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/common/api/WxConsts.java   | 32 +++++++----
 .../wx/miniapp/bean/WxMaMessage.java          | 56 +++++++++++++++++++
 2 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
index 20da30f58..70c4e4793 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
@@ -465,32 +465,40 @@ public class WxConsts {
     /**
      * 名称审核事件
      */
-    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";
+  }
 
   /**
    * 上传多媒体（临时素材）文件的类型.
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
index d95882a24..88450403e 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
@@ -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;
+  /**
+   * 发货时间，秒级时间戳
+   */
+  @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;
+
   /**
    * 不要直接使用这个字段，
    * 这个字段只是为了适配 SubscribeMsgPopupEvent SubscribeMsgChangeEvent SubscribeMsgSentEvent