From 6d1e8b12e5f3d4f81404cf318bddfaf92a940c27 Mon Sep 17 00:00:00 2001 From: 362270511 <362270511@qq.com> Date: Thu, 15 Aug 2024 12:04:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Admin.NET/Admin.NET.Co?= =?UTF-8?q?re/Entity/SysWechatPay.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改OrderId和OrderStatus改为字符串，字符串兼容性更好 --- Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 /// 关联的商户订单号 /// [SugarColumn(ColumnDescription = "OrderId")] - public virtual long OrderId { get; set; } + public virtual string OrderId { get; set; } /// /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// [SugarColumn(ColumnDescription = "OrderStatus")] - public virtual int OrderStatus { get; set; } + public virtual string OrderStatus { get; set; } /// /// 微信商户号 From cbb2082bde4446a99ffbec05feaca5e8fe8d5228 Mon Sep 17 00:00:00 2001 From: 362270511 <362270511@qq.com> Date: Thu, 15 Aug 2024 12:05:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Admin.NET/Admin.NET.Co?= =?UTF-8?q?re/Entity/SysWechatRefund.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改OrderId和OrderStatus改为字符串，字符串兼容性更好 --- Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 /// /// 关联的商户订单号 /// - [SugarColumn(ColumnDescription = "关联的用户订单号")] - public long OrderId { get; set; } + [SugarColumn(ColumnDescription = "关联的用户订单号", Length = 256)] + public string OrderId { get; set; } /// /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// - [SugarColumn(ColumnDescription = "关联的商户订单状态")] - public int OrderStatus { get; set; } + [SugarColumn(ColumnDescription = "关联的商户订单状态", Length = 32)] + public string OrderStatus { get; set; } + /// /// 关联的商户商品编码 From cacd32b38954000e1136086b5b2f4ff73ce49b88 Mon Sep 17 00:00:00 2001 From: 362270511 <362270511@qq.com> Date: Thu, 15 Aug 2024 12:07:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Admin.NET/Admin.NET.Co?= =?UTF-8?q?re/Service/Wechat/Dto/WechatPayInput.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改OrderId和OrderStatus字段类型改为string，这样兼容性更强 --- .../Service/Wechat/Dto/WechatPayInput.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 /// /// 关联的商户订单号 /// - public long OrderId { get; set; } + public string OrderId { get; set; } /// /// 关联的商户订单付款状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// - public int OrderStatus { get; set; } = 0; + public string OrderStatus { get; set; } = "0"; } public class WechatPayParaInput @@ -81,12 +81,12 @@ public class RefundRequestInput // : WechatTenpayRequest /// /// 关联的商户订单号 /// - public long OrderId { get; set; } + public string OrderId { get; set; } /// /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// - public int OrderStatus { get; set; } + public string OrderStatus { get; set; } /// /// 关联的商户商品编码 @@ -130,13 +130,13 @@ public class PageSysWechatPayInput : BasePageInput /// order_id /// /// - public long? OrderId { get; set; } = -1; + public string? OrderId { get; set; } = "-1"; /// /// order_status /// /// - public long? OrderStatus { get; set; } = -1; + public string? OrderStatus { get; set; } = "-1"; /// /// out_trade_number From 64ef44d2d8411553023656d1616f0f50f66b812f Mon Sep 17 00:00:00 2001 From: 362270511 <362270511@qq.com> Date: Thu, 15 Aug 2024 12:10:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Admin.NET/Admin.NET.Co?= =?UTF-8?q?re/Service/Wechat/SysWechatPayService.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改OrderId和OrderStatus字段类型改为string，这样兼容性更强 --- .../Admin.NET.Core/Service/Wechat/SysWechatPayService.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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> 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)