diff --git a/Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs b/Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs index 8a309673..94b33c53 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs @@ -35,7 +35,7 @@ public class SysWechatRefund : EntityBase [Required] public string OutRefundNo { get; set; } - /// + /// /// 退款原因,示例:商品已售完 /// [SugarColumn(ColumnDescription = "退款原因", Length = 80)] @@ -62,7 +62,7 @@ public class SysWechatRefund : EntityBase /// /// 退款资金来源, 可不传,默认使用未结算资金退款(仅对老资金流商户适用) /// - [SugarColumn(ColumnDescription = "退款资金来源", Length = 32)] + [SugarColumn(ColumnDescription = "退款资金来源", Length = 32)] public string FundsAccount { get; set; } /// @@ -111,11 +111,11 @@ public class SysWechatRefund : EntityBase /// 附加数据 /// [SugarColumn(ColumnDescription = "附加数据")] - public string? Attachment { get; set; } + public string? Attachment { get; set; } /// /// 备注 /// [SugarColumn(ColumnDescription = "备注")] - public string? Remark { get; set; } + public string? Remark { get; set; } } \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Service/Common/SysCommonService.cs b/Admin.NET/Admin.NET.Core/Service/Common/SysCommonService.cs index f7cf22a5..91813ae2 100644 --- a/Admin.NET/Admin.NET.Core/Service/Common/SysCommonService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Common/SysCommonService.cs @@ -104,7 +104,7 @@ public class SysCommonService : IDynamicApiController, ITransient // 接口信息 var apiController = apiOuput.Children.FirstOrDefault(u => u.Name.Equals(controllerName)); - var displayName = controllerActionDescriptor.MethodInfo.GetCustomAttribute(true)?.DisplayName; + var displayName = controllerActionDescriptor.MethodInfo.GetCustomAttribute(true)?.DisplayName; apiController.Children.Add(new ApiOutput { Name = displayName, diff --git a/Admin.NET/Admin.NET.Core/Service/Message/Dto/MessageInput.cs b/Admin.NET/Admin.NET.Core/Service/Message/Dto/MessageInput.cs index 0501ec76..d8d43d65 100644 --- a/Admin.NET/Admin.NET.Core/Service/Message/Dto/MessageInput.cs +++ b/Admin.NET/Admin.NET.Core/Service/Message/Dto/MessageInput.cs @@ -41,7 +41,7 @@ public class MessageInput /// /// 发送者Id /// - public string SendUserId{ get; set; } + public string SendUserId { get; set; } /// /// 发送者名称 diff --git a/Admin.NET/Admin.NET.Core/Service/Message/SysSmsService.cs b/Admin.NET/Admin.NET.Core/Service/Message/SysSmsService.cs index a1443280..20fe2542 100644 --- a/Admin.NET/Admin.NET.Core/Service/Message/SysSmsService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Message/SysSmsService.cs @@ -8,7 +8,6 @@ using AlibabaCloud.SDK.Dysmsapi20170525.Models; using TencentCloud.Common; using TencentCloud.Common.Profile; using TencentCloud.Sms.V20190711; -using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionRequest.Types; namespace Admin.NET.Core.Service; 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 84fe10af..2b4b458b 100644 --- a/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayInput.cs +++ b/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayInput.cs @@ -52,13 +52,13 @@ public class WechatPayParaInput public string PrepayId { get; set; } } - public class RefundRequestInput // : WechatTenpayRequest { /// /// 商户订单号(原支付交易对应的付款单号) /// public string OutTradeNumber { get; set; } + ///// ///// 退款单号 ///// @@ -67,46 +67,57 @@ public class RefundRequestInput // : WechatTenpayRequest /// 原订单金额(分) /// public int Total { get; set; } + /// /// 退款金额(分) /// public int Refund { get; set; } + /// /// 退款原因 /// public string Reason { get; set; } + /// /// 关联的商户订单号 /// public long OrderId { get; set; } + /// /// 关联的商户订单状态(或者为第几次支付,有些订单涉及多次支付,比如先付预付款,后补尾款) /// public int OrderStatus { get; set; } + /// /// 关联的商户商品编码 /// public string MerchantGoodsId { get; set; } + /// /// 关联的商户商品名称 /// public string GoodsName { get; set; } + /// /// 关联的商户商品单价 /// public int UnitPrice { get; set; } = 0; + /// /// 关联的商户商品退款金额 /// public int RefundAmount { get; set; } = 0; + /// /// 关联的商户商品退货数量 /// public int RefundQuantity { get; set; } = 1; + /// /// 附加数据 /// public string Attachment { get; set; } + /// /// 备注 /// @@ -120,6 +131,7 @@ public class PageSysWechatPayInput : BasePageInput /// /// public long? OrderId { get; set; } = -1; + /// /// order_status /// @@ -131,11 +143,13 @@ public class PageSysWechatPayInput : BasePageInput /// /// public string OutTradeNumber { get; set; } + /// /// success_time范围 /// /// public List SuccessTimeRange { get; set; } + /// /// expire_time范围 /// diff --git a/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayOutput.cs b/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayOutput.cs index 9a664e5d..0093bf66 100644 --- a/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayOutput.cs +++ b/Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayOutput.cs @@ -12,38 +12,47 @@ public class WechatPayOutput /// OpenId /// public string OpenId { get; set; } + /// /// 商户(支付交易)单号,微信唯一 /// public string OutTradeNumber { get; set; } + /// /// 关联的商户(商品交易)订单号 /// public long OrderId { get; set; } + /// /// 关联的商户订单状态(或者为第几次支付,有些订单涉及多次支付,比如先付预付款,后补尾款) /// public int OrderStatus { get; set; } + /// /// 订单金额 /// public int Total { get; set; } + /// /// 附加数据 /// public string Attachment { get; set; } + /// /// 优惠标记 /// public string GoodsTag { get; set; } + /// /// 支付发起时间 /// public DateTimeOffset CreateTime { get; set; } + /// /// 支付完成时间 /// public DateTimeOffset SuccessTime { get; set; } + /// /// 交易状态(支付成功后,微信返回) /// @@ -59,4 +68,4 @@ public class CreatePayTransactionOutput { public string PrepayId { get; set; } public string OutTradeNumber { get; set; } -} +} \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs b/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs index 1a6d9360..905974f6 100644 --- a/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs @@ -411,7 +411,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient wechatPay.BankType = response.BankType; // 付款银行类型 wechatPay.Total = response.Amount.Total; // 订单总金额 wechatPay.PayerTotal = response.Amount.PayerTotal; // 用户支付金额 - wechatPay.SuccessTime = response.SuccessTime; // 支付完成时间 + wechatPay.SuccessTime = response.SuccessTime; // 支付完成时间 await _sysWechatPayRep.AsUpdateable(wechatPay).IgnoreColumns(true).ExecuteCommandAsync(); return wechatPay.Adapt(); } diff --git a/Web/src/components/table/modifyRecord.vue b/Web/src/components/table/modifyRecord.vue index 62079ac5..13f6e294 100644 --- a/Web/src/components/table/modifyRecord.vue +++ b/Web/src/components/table/modifyRecord.vue @@ -1,5 +1,5 @@