diff --git a/Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs b/Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs
index 9c6c3930..d55b6ecb 100644
--- a/Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs
@@ -18,13 +18,13 @@ public partial class SysWechatPay : EntityBase
     /// 关联的商户订单号
     /// </summary>
     [SugarColumn(ColumnDescription = "OrderId")]
-    public virtual long OrderId { get; set; }
+    public virtual string OrderId { get; set; }
 
     /// <summary>
     /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
     /// </summary>
     [SugarColumn(ColumnDescription = "OrderStatus")]
-    public virtual int OrderStatus { get; set; }
+    public virtual string OrderStatus { get; set; }
 
     /// <summary>
     /// 微信商户号
diff --git a/Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs b/Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs
index 9d907ae4..6570eec8 100644
--- a/Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs
@@ -68,14 +68,15 @@ public class SysWechatRefund : EntityBase
     /// <summary>
     /// 关联的商户订单号
     /// </summary>
-    [SugarColumn(ColumnDescription = "关联的用户订单号")]
-    public long OrderId { get; set; }
+    [SugarColumn(ColumnDescription = "关联的用户订单号", Length = 256)]
+    public string OrderId { get; set; }
 
     /// <summary>
     /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
     /// </summary>
-    [SugarColumn(ColumnDescription = "关联的商户订单状态")]
-    public int OrderStatus { get; set; }
+    [SugarColumn(ColumnDescription = "关联的商户订单状态", Length = 32)]
+    public string OrderStatus { get; set; }
+
 
     /// <summary>
     /// 关联的商户商品编码
diff --git a/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayInput.cs b/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayInput.cs
index 2b4b458b..df8d477d 100644
--- a/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayInput.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayInput.cs
@@ -36,12 +36,12 @@ public class WechatPayTransactionInput
     /// <summary>
     /// 关联的商户订单号
     /// </summary>
-    public long OrderId { get; set; }
+    public string OrderId { get; set; }
 
     /// <summary>
     /// 关联的商户订单付款状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
     /// </summary>
-    public int OrderStatus { get; set; } = 0;
+    public string OrderStatus { get; set; } = "0";
 }
 
 public class WechatPayParaInput
@@ -81,12 +81,12 @@ public class RefundRequestInput // : WechatTenpayRequest
     /// <summary>
     /// 关联的商户订单号
     /// </summary>
-    public long OrderId { get; set; }
+    public string OrderId { get; set; }
 
     /// <summary>
     /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
     /// </summary>
-    public int OrderStatus { get; set; }
+    public string OrderStatus { get; set; }
 
     /// <summary>
     /// 关联的商户商品编码
@@ -130,13 +130,13 @@ public class PageSysWechatPayInput : BasePageInput
     /// order_id
     /// </summary>
     /// <example></example>
-    public long? OrderId { get; set; } = -1;
+    public string? OrderId { get; set; } = "-1";
 
     /// <summary>
     /// order_status
     /// </summary>
     /// <example></example>
-    public long? OrderStatus { get; set; } = -1;
+    public string? OrderStatus { get; set; } = "-1";
 
     /// <summary>
     /// out_trade_number
diff --git a/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs b/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs
index bb0f11ee..5e7d406f 100644
--- a/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs
@@ -439,8 +439,10 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     public async Task<SqlSugarPagedList<SysWechatPay>> PageAsync(PageSysWechatPayInput input)
     {
         var query = _sysWechatPayRep.AsQueryable()
-            .WhereIF(input.OrderId > 0, u => u.OrderId == input.OrderId)
-            .WhereIF(input.OrderStatus > 0, u => u.OrderStatus == input.OrderStatus)
+            //.WhereIF(input.OrderId > 0, u => u.OrderId == input.OrderId)
+            //.WhereIF(input.OrderStatus > 0, u => u.OrderStatus == input.OrderStatus)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId == input.OrderId)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderStatus), u => u.OrderStatus == input.OrderStatus)
             .WhereIF(!string.IsNullOrWhiteSpace(input.OutTradeNumber), u => u.OutTradeNumber.Contains(input.OutTradeNumber.Trim()));
 
         if (input.SuccessTimeRange != null && input.SuccessTimeRange.Count > 0)