LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
@@ -10,6 +10,10 @@ public interface ILifePayService : IApplicationService { //Task<ElectricParValueResponse> GetTopStatistics(); /// <summary> /// 获取电费面值 /// </summary> @@ -54,8 +58,10 @@ /// <param name="orderNo"></param> /// <param name="acoolyOrderNo"></param> /// <param name="status"></param> /// <param name="acoolyStatus"></param> /// <param name="payAmount"></param> /// <returns></returns> Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status); Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount); /// <summary> /// 创建生活缴费话费订单 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -181,6 +181,11 @@ public decimal RechargeAmount { get; set; } /// <summary> /// 实际充值金额 /// </summary> public decimal? ActualRechargeAmount { get; set; } /// <summary> /// 优惠金额 /// </summary> public decimal DiscountAmount { get; set; } @@ -194,6 +199,12 @@ /// 支付时间 /// </summary> public DateTime? PayTime { get; set; } /// <summary> /// 平台扣款金额 /// </summary> public decimal? PlatformDeductionAmount { get; set; } /// <summary> /// 支付状态 @@ -230,12 +241,25 @@ /// </summary> public DateTime? RefundTime { get; set; } /// <summary> /// 申请退款原因 /// </summary> public string RefundApplyRemark { get; set; } /// <summary> /// 驳回原因 /// </summary> public string RefundCheckRemark { get; set; } /// <summary> /// 平台订单号 /// </summary> public string ACOOLYOrderNo { get; set; } /// <summary> /// 供应商 /// </summary> public ACOOLYStatusEnum? ACOOLYStatus { get; set; } } @@ -504,4 +528,19 @@ public DateTime CreationTime { get; set; } public bool IsDeleted { get; set; } } public class TopStatisticsOutput { /// <summary> /// 账户余额 /// </summary> public string Amount { get; set; } /// <summary> /// 累计收款 /// </summary> public string AccumulatedReceipts { get; set; } } LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -19,6 +19,7 @@ using Volo.Abp.EventBus.Distributed; using Z.EntityFramework.Plus; using ZeroD.Util; using Alipay.EasySDK.Payment.Common.Models; using static LifePayment.Domain.Shared.LifePaymentConstant; namespace LifePayment.Application; @@ -218,7 +219,6 @@ /// <returns></returns> public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input) { var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository) .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime) .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime) @@ -254,7 +254,10 @@ RefundCheckRemark = a.RefundCheckRemark, RefundApplyRemark = a.RefundApplyRemark, RefundTime = a.RefundTime, ChannelName = b.ChannlesName ChannelName = b.ChannlesName, ActualRechargeAmount = a.ActualRechargeAmount, PlatformDeductionAmount = a.PlatformDeductionAmount, ACOOLYStatus = a.ACOOLYStatus }).GetPageResult(input.PageModel); return result; @@ -965,7 +968,7 @@ /// <param name="orderNo"></param> /// <param name="outOrderNo"></param> /// <returns></returns> public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status) public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount) { var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync(); CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在"); @@ -976,6 +979,8 @@ } order.LifePayOrderStatus = status; order.ACOOLYStatus = acoolyStatus; order.PlatformDeductionAmount = payAmount; if (acoolyOrderNo.IsNotNullOrEmpty()) { order.ACOOLYOrderNo = acoolyOrderNo; @@ -1015,11 +1020,39 @@ throw new UserFriendlyException("当前订单状态无法退款"); } /// TODO 退款请求完成后如何操作 /// var refundResult = await WxPayDomesticRefunds(order.OrderNo, order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100)); switch (order.LifePayType) { case LifePayTypeEnum.WxPay: var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100)); if (wxRefundResult.Status == "SUCCESS") { order.PayStatus = LifePayStatusEnum.已退款; order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款; } else if (wxRefundResult.Status == "PROCESSING") { order.PayStatus = LifePayStatusEnum.退款中; order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中; } else { throw new UserFriendlyException("退款失败"); } order.PayStatus = LifePayStatusEnum.已退款; order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款; break; case LifePayTypeEnum.AliPay: var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = order.PayAmount.ToString() }); if (aliRefundResult.Code != AlipayResultCode.Success) { throw new UserFriendlyException("退款失败"); } order.PayStatus = LifePayStatusEnum.已退款; order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款; break; default: throw new UserFriendlyException("退款失败"); } order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl; order.RefundCheckRemark = input.RefundCheckRemark; order.RefundTime = DateTime.Now; @@ -1063,7 +1096,7 @@ order.LifePayOrderStatus = LifePayOrderStatusEnum.退款待审核; order.RefundApplyRemark = input.RefundApplyRemark; order.RefundTime = DateTime.Now; order.RefundApplyTime = DateTime.Now; await _lifePayOrderRepository.UpdateAsync(order); } @@ -1097,7 +1130,10 @@ return res; } private async Task<AlipayTradeRefundResponse> AliTradeRefund(AlipayTradeRefundRequest input) { return await _aliPayApi.TradeRefund(input); } public async Task<int> AddUpdateUserAccount(AddUpdateUserAccountInput input) { @@ -1492,7 +1528,6 @@ CheckExtensions.IfTrueThrowUserFriendlyException(amount <= 0, CustomeErrorMessage.SometingMustSometing, "获取支付二维码时金额", "大于0"); var res = await _wxPayApi.PayTransactionsH5(new PayTransactionsNativeH5 { Appid = _wxPayOptions.AppID, @@ -1545,6 +1580,7 @@ return res.QrCode; } /// <summary> /// 构造待签名字符串 /// </summary> LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYConstant.cs
@@ -62,5 +62,20 @@ public const string PROCESSING = "PROCESSING"; } public static class Status { public const string 充值成功 = "SUCCESS"; public const string 充值中 = "PROCESSING"; public const string 充值失败 = "FAIL"; public const string 退款中 = "REFUNDING"; public const string 退款完成 = "REFUND_CLOSE"; public const string 失败关闭 = "FAIL_CLOSE"; } public const string NotifyUrl = "/api/ACOOLYNotify/ACOOLYNotify"; } LifePayment/LifePayment.Domain.Shared/Ali/GetPayQrCodeInput.cs
@@ -25,4 +25,14 @@ /// </summary> public string OutTradeNo { get; set; } } public class AlipayTradeRefundRequest { /// <summary> /// 交易创建时传入的商户订单号 /// </summary> public string OutTradeNo { get; set; } public string RefundAmount { get; set; } } } LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
@@ -35,7 +35,10 @@ 待退款 = 30, [Description("已退款")] 已退款 = 40, 已退款 = 40, [Description("退款中")] 退款中 = 50, } public enum LifePayOrderStatusEnum @@ -57,6 +60,26 @@ [Description("退款失败")] 退款失败 = 60, [Description("退款中")] 退款中 = 70, } public enum ACOOLYStatusEnum { [Description("充值中")] 充值中 = 10, [Description("充值成功")] 充值成功 = 20, [Description("已完成")] 已完成 = 30, [Description("部分充值成功")] 部分充值成功 = 40, [Description("充值失败")] 充值失败 = 50, [Description("已退款")] 已退款 = 60, } public enum LifePayRefundStatusEnum LifePayment/LifePayment.Domain/Ali/AliPayApi.cs
@@ -33,5 +33,11 @@ AlipayTradeQueryResponse response = Factory.Payment.Common().Query(input.OutTradeNo); return response; } public async Task<AlipayTradeRefundResponse> TradeRefund(AlipayTradeRefundRequest input) { AlipayTradeRefundResponse response = Factory.Payment.Common().Refund(input.OutTradeNo,input.RefundAmount); return response; } } } LifePayment/LifePayment.Domain/Ali/AlipayApiConstant.cs
@@ -26,6 +26,8 @@ internal const string DataBillErceiptApply = "alipay.data.bill.ereceiptagent.apply"; internal const string DataBillEreceiptQuery = "alipay.data.bill.accountbookereceipt.query"; internal const string DataDataserviceBillDownloadUrlQuery = "alipay.data.dataservice.bill.downloadurl.query"; } public class AlipayResultCode LifePayment/LifePayment.Domain/Ali/IAliPayApi.cs
@@ -11,5 +11,7 @@ Task<AlipayTradePrecreateResponse> GetAliPayQRCode(GetPayQrCodeInput input); AlipayTradeQueryResponse OrderInQuiry(OrderInQuiryInput input); Task<AlipayTradeRefundResponse> TradeRefund(AlipayTradeRefundRequest input); } } LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -38,6 +38,8 @@ /// </summary> public decimal RechargeAmount { get; set; } /// <summary> /// 优惠金额 /// </summary> @@ -47,6 +49,11 @@ /// 实付金额 /// </summary> public decimal PayAmount { get; set; } /// <summary> /// 平台扣款金额 /// </summary> public decimal? PlatformDeductionAmount { get; set; } /// <summary> /// 支付时间 @@ -74,6 +81,11 @@ public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } /// <summary> /// 平台状态 /// </summary> public ACOOLYStatusEnum? ACOOLYStatus { get; set; } /// <summary> /// 完成时间 /// </summary> public DateTime? FinishTime { get; set; } @@ -98,12 +110,29 @@ /// </summary> public DateTime? RefundTime { get; set; } /// <summary> /// 退款申请原因 /// </summary> public string RefundApplyRemark { get; set; } /// <summary> /// 退款申请时间 /// </summary> public DateTime? RefundApplyTime { get; set; } /// <summary> /// 驳回原因 /// </summary> public string RefundCheckRemark { get; set; } /// <summary> /// 退款审核人 /// </summary> public Guid? RefundCheckUserId { get; set; } public string? ChannelId { get; set; } /// 实际充值金额 /// </summary> public decimal? ActualRechargeAmount { get; set; } } } LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -42,13 +42,15 @@ <param name="outOrderNo"></param> <returns></returns> </member> <member name="M:LifePayment.Application.Contracts.ILifePayService.ACOOLYOrderNotifyHandler(System.String,System.String,LifePayment.Domain.Shared.LifePayOrderStatusEnum)"> <member name="M:LifePayment.Application.Contracts.ILifePayService.ACOOLYOrderNotifyHandler(System.String,System.String,LifePayment.Domain.Shared.LifePayOrderStatusEnum,LifePayment.Domain.Shared.ACOOLYStatusEnum,System.Decimal)"> <summary> 支付成功回调处理 </summary> <param name="orderNo"></param> <param name="acoolyOrderNo"></param> <param name="status"></param> <param name="acoolyStatus"></param> <param name="payAmount"></param> <returns></returns> </member> <member name="M:LifePayment.Application.Contracts.ILifePayService.CreateLifePayPhoneOrder(LifePayment.Application.Contracts.CreateLifePayOrderInput{LifePayment.Application.Contracts.LifePhoneData})"> @@ -621,6 +623,11 @@ 充值金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ActualRechargeAmount"> <summary> 实际充值金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.DiscountAmount"> <summary> 优惠金额 @@ -634,6 +641,11 @@ <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.PayTime"> <summary> 支付时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.PlatformDeductionAmount"> <summary> 平台扣款金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.PayStatus"> @@ -669,6 +681,26 @@ <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.RefundTime"> <summary> 退款时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.RefundApplyRemark"> <summary> 申请退款原因 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.RefundCheckRemark"> <summary> 驳回原因 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ACOOLYOrderNo"> <summary> 平台订单号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ACOOLYStatus"> <summary> 供应商 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.CreationTime"> @@ -851,6 +883,16 @@ 创建时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.TopStatisticsOutput.Amount"> <summary> 账户余额 </summary> </member> <member name="P:LifePayment.Application.Contracts.TopStatisticsOutput.AccumulatedReceipts"> <summary> 累计收款 </summary> </member> <member name="P:LifePayment.Application.Contracts.RecordOperateHistoryEto.RelationId"> <summary> 关联关系ID LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -53,7 +53,9 @@ var baseInfo = JsonConvert.DeserializeObject<ACOOLYRequestBaseResponse>(body); var orderNo = string.Empty; var status = LifePayOrderStatusEnum.待确认; var acoolyStatus = ACOOLYStatusEnum.充值失败; var acoolyOrderNo = string.Empty; decimal payAmount = 0; _logger.LogError("ACOOLY回调通处理类型：" + baseInfo.Service); _logger.LogError("ACOOLY回调内容：" + body); switch (baseInfo.Service) @@ -62,29 +64,41 @@ var confirmElectricOrderResponse = JsonConvert.DeserializeObject<ConfirmElectricOrderResponse>(body); orderNo = confirmElectricOrderResponse.ElectricChargeOrder.OutOrderNo; acoolyOrderNo = confirmElectricOrderResponse.ElectricChargeOrder.BusiOrderNo; payAmount = confirmElectricOrderResponse.ElectricChargeOrder.PayAmount; _logger.LogError("ACOOLY回调通处理结果状态：" + confirmElectricOrderResponse.ElectricChargeOrder.Status); /// TODO 状态不正确 if (!confirmElectricOrderResponse.Success || (confirmElectricOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmElectricOrderResponse.Code != ACOOLYConstant.Code.PROCESSING)) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } else if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Code.SUCCESS) if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.充值成功) { status = LifePayOrderStatusEnum.已完成; if (confirmElectricOrderResponse.ElectricChargeOrder.ParValue == confirmElectricOrderResponse.ElectricChargeOrder.PayAmount) { acoolyStatus = ACOOLYStatusEnum.充值成功; } else { acoolyStatus = ACOOLYStatusEnum.部分充值成功; } } else if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Code.PROCESSING) if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.充值中) { status = LifePayOrderStatusEnum.待确认; acoolyStatus = ACOOLYStatusEnum.充值中; } else { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } break; @@ -92,35 +106,88 @@ var confirmPhoneOrderResponse = JsonConvert.DeserializeObject<ConfirmPhoneOrderResponse>(body); orderNo = confirmPhoneOrderResponse.PhoneChargeOrder.OutOrderNo; acoolyOrderNo = confirmPhoneOrderResponse.PhoneChargeOrder.BusiOrderNo; payAmount = confirmPhoneOrderResponse.PhoneChargeOrder.PayAmount; _logger.LogError("ACOOLY回调通处理结果状态：" + confirmPhoneOrderResponse.PhoneChargeOrder.Status); if (!confirmPhoneOrderResponse.Success || (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING)) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Code.SUCCESS) if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值成功) { status = LifePayOrderStatusEnum.已完成; if (confirmPhoneOrderResponse.PhoneChargeOrder.ParValue == confirmPhoneOrderResponse.PhoneChargeOrder.PayAmount) { acoolyStatus = ACOOLYStatusEnum.充值成功; } else { acoolyStatus = ACOOLYStatusEnum.部分充值成功; } } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Code.PROCESSING) if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值中) { status = LifePayOrderStatusEnum.待确认; acoolyStatus = ACOOLYStatusEnum.充值中; } else { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } break; case ACOOLYConstant.Sevice.ConfirmGasOrder: var confirmGasOrderResponse = JsonConvert.DeserializeObject<ConfirmGasOrderResponse>(body); orderNo = confirmGasOrderResponse.GasChargeOrder.OutOrderNo; acoolyOrderNo = confirmGasOrderResponse.GasChargeOrder.BusiOrderNo; payAmount = confirmGasOrderResponse.GasChargeOrder.PayAmount; _logger.LogError("ACOOLY回调通处理结果状态：" + confirmGasOrderResponse.GasChargeOrder.Status); if (!confirmGasOrderResponse.Success || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING)) { status = LifePayOrderStatusEnum.已失败; } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值成功) { status = LifePayOrderStatusEnum.已完成; // TODO 确认什么情况下可以判断是部分充值成功 //if (confirmGasOrderResponse.GasChargeOrder.ParValue == confirmGasOrderResponse.GasChargeOrder.PayAmount) //{ // acoolyStatus = ACOOLYStatusEnum.充值成功; //} //else //{ // acoolyStatus = ACOOLYStatusEnum.部分充值成功; //} } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值中) { status = LifePayOrderStatusEnum.待确认; acoolyStatus = ACOOLYStatusEnum.充值中; } else { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } break; default: break; } await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status); await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount); } } } LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -36,6 +36,17 @@ #region 查询 /// <summary> /// 获取顶部统计数据 /// </summary> /// <returns></returns> //[HttpGet] //[AllowAnonymous] //public async Task<TopStatisticsOutput> GetTopStatistics() //{ // return await _lifePayService.GetTopStatistics(); //} /// <summary> /// 获取电费面值 /// </summary> /// <returns></returns> @@ -181,6 +192,18 @@ } /// <summary> /// 获取订单详情 /// </summary> /// <param name="orderNo"></param> /// <returns></returns> //[HttpGet] //public async Task<UserLifePayOrderOutput> GetLifePayOrderDetail(string orderNo) //{ // return await _lifePayService.GetLifePayOrderDetail(orderNo); //} /// <summary> /// 获取我的订单分页数据 /// </summary> /// <param name="input"></param>
