LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -329,6 +329,14 @@ public string RechargeAmountStr { get; set; } /// <summary> /// 实际充值金额 /// </summary> public decimal ActualRechargeAmount { get; set; } [Name("实际充值金额")] public string ActualRechargeAmountStr { get; set; } /// <summary> /// 优惠金额 /// </summary> public decimal DiscountAmount { get; set; } @@ -356,6 +364,30 @@ public string ACOOLYOrderNo { get; set; } /// <summary> /// 平台扣款金额 /// </summary> [Name("平台扣款金额")] public decimal PlatformPrice { get; set; } /// <summary> /// 平台退款状态 /// </summary> public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } [Name("平台退款状态")] public string? LifePayRefundStatusStr { get; set; } public ACOOLYStatusEnum? ACOOLYStatus { get; set; } /// <summary> /// 供应商订单状态 /// </summary> [Name("供应商订单状态")] public string? ACOOLYStatusStr { get; set; } /// <summary> /// 支付状态 /// </summary> public LifePayStatusEnum PayStatus { get; set; } @@ -366,16 +398,16 @@ [Name("支付渠道流水号")] public string OutOrderNo { get; set; } [Name("退款申请")] public string RefundApplyRemark { get; set; } //[Name("退款申请")] //public string RefundApplyRemark { get; set; } /// <summary> /// 订单状态 /// </summary> public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } ///// <summary> ///// 订单状态 ///// </summary> //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } [Name("订单状态")] public string LifePayOrderStatusStr { get; set; } //[Name("订单状态")] //public string LifePayOrderStatusStr { get; set; } /// <summary> /// 完成时间 LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
@@ -26,7 +26,7 @@ /// <summary> /// 账户 /// </summary> [RegularExpression(LifePaymentConstant.RegularExpression.UserNameEx, ErrorMessage = "账号格式不正确")] //[RegularExpression(LifePaymentConstant.RegularExpression.UserNameEx, ErrorMessage = "账号格式不正确")] public string UserName { get; set; } public string Remark { get; set; } LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -721,11 +721,12 @@ { DiscountAmount = x.DiscountAmount, FinishTime = x.FinishTime, LifePayOrderStatus = x.LifePayOrderStatus, //LifePayOrderStatus = x.LifePayOrderStatus, LifePayOrderType = x.LifePayOrderType, LifePayType = x.LifePayType, OrderNo = x.OrderNo, PayAmount = x.PayAmount, ActualRechargeAmount = x.ActualRechargeAmount.HasValue?x.ActualRechargeAmount.Value:0, PhoneNumber = x.PhoneNumber, RechargeAmount = x.RechargeAmount, OutOrderNo = x.OutOrderNo, @@ -733,8 +734,11 @@ PayTime = x.PayTime, ACOOLYOrderNo = x.ACOOLYOrderNo, CreationTime = x.CreationTime, RefundApplyRemark = x.RefundApplyRemark, ChannelName = x.ChannelName LifePayRefundStatus = x.LifePayRefundStatus, ACOOLYStatus = x.ACOOLYStatus, //RefundApplyRemark = x.RefundApplyRemark, ChannelName = x.ChannelName, PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0 }).OrderByDescending(r => r.CreationTime).ToListAsync(); var i = 0; result.ForEach(s => @@ -747,7 +751,10 @@ s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm); s.LifePayTypeStr = s.LifePayType.GetDescription(); s.PayStatusStr = s.PayStatus.GetDescription(); s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription(); s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2"); s.LifePayRefundStatusStr = s.LifePayRefundStatusStr.GetDescription(); s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription(); //s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription(); s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm); }); return result; @@ -1398,9 +1405,9 @@ && order.LifePayOrderStatus != LifePayOrderStatusEnum.待退款 && order.LifePayOrderStatus != LifePayOrderStatusEnum.已退款) { order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款; order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款; order.RefundApplyRemark = input.RefundApplyRemark; order.RefundApplyTime = DateTime.Now; await _lifePayOrderRepository.UpdateAsync(order); } else if (order.LifePayOrderStatus == LifePayOrderStatusEnum.待退款 || order.LifePayRefundStatus == LifePayRefundStatusEnum.待退款 || LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -856,6 +856,11 @@ 充值金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.ActualRechargeAmount"> <summary> 实际充值金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.DiscountAmount"> <summary> 优惠金额 @@ -871,14 +876,24 @@ 支付时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.PlatformPrice"> <summary> 平台扣款金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.LifePayRefundStatus"> <summary> 平台退款状态 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.ACOOLYStatusStr"> <summary> 供应商订单状态 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.PayStatus"> <summary> 支付状态 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.LifePayOrderStatus"> <summary> 订单状态 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.FinishTime">
