gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'main' (#96) from 362270511/Admin.NET.Pro:main into main

Browse Source 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/96
This commit is contained in:
zuohuaijun 2024-08-15 12:53:36 +08:00
commit 79c5ddcb89
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs
View File

@ -18,13 +18,13 @@ public partial class SysWechatPay : EntityBase
/// 关联的商户订单号 /// 关联的商户订单号
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "OrderId")] [SugarColumn(ColumnDescription = "OrderId")]
public virtual long OrderId { get; set; } public virtual string OrderId { get; set; }
/// <summary> /// <summary>
/// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "OrderStatus")] [SugarColumn(ColumnDescription = "OrderStatus")]
public virtual int OrderStatus { get; set; } public virtual string OrderStatus { get; set; }
/// <summary> /// <summary>
/// 微信商户号 /// 微信商户号

9
Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs
View File

@ -68,14 +68,15 @@ public class SysWechatRefund : EntityBase
/// <summary> /// <summary>
/// 关联的商户订单号 /// 关联的商户订单号
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "关联的用户订单号")] [SugarColumn(ColumnDescription = "关联的用户订单号", Length = 256)]
public long OrderId { get; set; } public string OrderId { get; set; }
/// <summary> /// <summary>
/// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "关联的商户订单状态")] [SugarColumn(ColumnDescription = "关联的商户订单状态", Length = 32)]
public int OrderStatus { get; set; } public string OrderStatus { get; set; }
/// <summary> /// <summary>
/// 关联的商户商品编码 /// 关联的商户商品编码

12
Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WechatPayInput.cs
View File

@ -36,12 +36,12 @@ public class WechatPayTransactionInput
/// <summary> /// <summary>
/// 关联的商户订单号 /// 关联的商户订单号
/// </summary> /// </summary>
public long OrderId { get; set; } public string OrderId { get; set; }
/// <summary> /// <summary>
/// 关联的商户订单付款状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// 关联的商户订单付款状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
/// </summary> /// </summary>
public int OrderStatus { get; set; } = 0; public string OrderStatus { get; set; } = "0";
} }
public class WechatPayParaInput public class WechatPayParaInput
@ -81,12 +81,12 @@ public class RefundRequestInput // : WechatTenpayRequest
/// <summary> /// <summary>
/// 关联的商户订单号 /// 关联的商户订单号
/// </summary> /// </summary>
public long OrderId { get; set; } public string OrderId { get; set; }
/// <summary> /// <summary>
/// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
/// </summary> /// </summary>
public int OrderStatus { get; set; } public string OrderStatus { get; set; }
/// <summary> /// <summary>
/// 关联的商户商品编码 /// 关联的商户商品编码
@ -130,13 +130,13 @@ public class PageSysWechatPayInput : BasePageInput
/// order_id /// order_id
/// </summary> /// </summary>
/// <example></example> /// <example></example>
public long? OrderId { get; set; } = -1; public string? OrderId { get; set; } = "-1";
/// <summary> /// <summary>
/// order_status /// order_status
/// </summary> /// </summary>
/// <example></example> /// <example></example>
public long? OrderStatus { get; set; } = -1; public string? OrderStatus { get; set; } = "-1";
/// <summary> /// <summary>
/// out_trade_number /// out_trade_number

6
Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs
View File

@ -439,8 +439,10 @@ public class SysWechatPayService : IDynamicApiController, ITransient
public async Task<SqlSugarPagedList<SysWechatPay>> PageAsync(PageSysWechatPayInput input) public async Task<SqlSugarPagedList<SysWechatPay>> PageAsync(PageSysWechatPayInput input)
{ {
var query = _sysWechatPayRep.AsQueryable() var query = _sysWechatPayRep.AsQueryable()
.WhereIF(input.OrderId > 0, u => u.OrderId == input.OrderId) //.WhereIF(input.OrderId > 0, u => u.OrderId == input.OrderId)
.WhereIF(input.OrderStatus > 0, u => u.OrderStatus == input.OrderStatus) //.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())); .WhereIF(!string.IsNullOrWhiteSpace(input.OutTradeNumber), u => u.OutTradeNumber.Contains(input.OutTradeNumber.Trim()));
if (input.SuccessTimeRange != null && input.SuccessTimeRange.Count > 0) if (input.SuccessTimeRange != null && input.SuccessTimeRange.Count > 0)