From 6e8002e5651adc7af7b17bf2032249eba8d7ddcf Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期二, 25 三月 2025 14:29:03 +0800 Subject: [PATCH] fix:bug修复 --- LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 208 ++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 147 insertions(+), 61 deletions(-) diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs index 64c30f2..f9b0fca 100644 --- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs +++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs @@ -283,7 +283,7 @@ RefundApplyRemark = a.RefundApplyRemark, RefundTime = a.RefundTime, ChannelName = b.ChannlesName, - ActualRechargeAmount = a.ActualRechargeAmount, + ActualRechargeAmount = a.RechargeAmount, PlatformDeductionAmount = a.PlatformDeductionAmount, ACOOLYStatus = a.ACOOLYStatus, LifePayRefundStatus = a.LifePayRefundStatus, @@ -302,9 +302,9 @@ var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository) .Where(x => x.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆句腑 - || x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆�) - .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime) - .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime) + || (x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆� && x.LifePayRefundStatus != LifePayRefundStatusEnum.閫�娆鹃┏鍥�)) + .WhereIf(input.BeginRefundTime.HasValue, x => x.RefundTime >= input.BeginRefundTime) + .WhereIf(input.EndRefundTime.HasValue, x => x.RefundTime <= input.EndRefundTime) .WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime) .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType) .WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime) @@ -340,7 +340,7 @@ RefundTime = a.RefundTime, RefundPrice = a.RefundPrice, ChannelName = b.ChannlesName, - ActualRechargeAmount = a.ActualRechargeAmount, + ActualRechargeAmount = a.RechargeAmount, PlatformDeductionAmount = a.PlatformDeductionAmount, ACOOLYStatus = a.ACOOLYStatus, LifePayRefundStatus = a.LifePayRefundStatus, @@ -358,7 +358,7 @@ { var result = await (await GetLifePayRefundOrderListFilter(input)).Select(x => new LifePayRefundOrderListTemplate { - FinishTime = x.FinishTime, + FinishTime = x.RefundTime, RefundPrice = x.RefundPrice, LifePayOrderType = x.LifePayOrderType, LifePayType = x.LifePayType, @@ -368,6 +368,7 @@ ChannelName = x.ChannelName, CreationTime = x.CreationTime, ACOOLYStatus = x.ACOOLYStatus, + RefundApplyRemark = x.RefundApplyRemark, RechargeAmount = x.RechargeAmount, ActualReceivedAmount = x.ActualReceivedAmount.ToString("F2"), LifePayRefundStatus = x.LifePayRefundStatus, @@ -379,7 +380,6 @@ s.SerialNumber = ++i; s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription(); s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription(); - s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm); s.RechargeAmountStr = s.RechargeAmount.ToString("F2"); s.ActualReceivedAmount = s.ActualReceivedAmount; s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription(); @@ -397,8 +397,10 @@ var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId); CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�"); var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId); - var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100; + var orderpirce = await GetOrderPrice(order.RechargeAmount, order.PayAmount,order.PlatformRate, order.ChannleRate, order.ChannlesRakeRate,order.PremiumRate); + + var result = new LifePayOrderOutput() { UserName = user.Name, @@ -424,18 +426,18 @@ RefundTime = order.RefundTime, ACOOLYOrderNo = order.ACOOLYOrderNo, LifePayRefundStatus = order.LifePayRefundStatus, - ActualRechargeAmount = order.ActualRechargeAmount, + ActualRechargeAmount = order.RechargeAmount, RefundPrice = order.RefundPrice, PlatformRate = order.PlatformRate, PlatformPrice = order.PlatformDeductionAmount, ElecBillUrl = order.ElecBillUrl.GetOssPath(), RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(), - ChannleRate = channle.ChannlesRate, - ChannlesRakeRate = channle.ChannlesRakeRate, - ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2), + ChannleRate = order.ChannleRate, + ChannlesRakeRate = order.ChannlesRakeRate, + ChannlesRakePrice = orderpirce.ChannlesRakePrice, PremiumRate = order.PremiumRate, - PremiumPrice = Math.Round(order.PayAmount * (order.PremiumRate.HasValue ? order.PremiumRate.Value:0), 2), - Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channle.ChannlesRakeRate / 100) - Math.Round(order.PayAmount * (order.PremiumRate.HasValue ? order.PremiumRate.Value : 0), 2) + PremiumPrice = orderpirce.PremiumPrice, + Profit = orderpirce.Profit }; return result; @@ -527,6 +529,7 @@ CreationTime = x.CreationTime, RefundCheckRemark = x.RefundCheckRemark, RefundApplyRemark = x.RefundApplyRemark, + RefundApplyTime = x.RefundApplyTime, RefundTime = x.RefundTime, ACOOLYOrderNo = x.ACOOLYOrderNo, LifePayRefundStatus = x.LifePayRefundStatus, @@ -738,24 +741,24 @@ ACOOLYStatus = x.ACOOLYStatus, //RefundApplyRemark = x.RefundApplyRemark, ChannelName = x.ChannelName, - PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0 + PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m }).OrderByDescending(r => r.CreationTime).ToListAsync(); var i = 0; result.ForEach(s => { s.SerialNumber = ++i; s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription(); - s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm); + s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss); s.RechargeAmountStr = s.RechargeAmount.ToString("F2"); s.PayAmountStr = s.PayAmount.ToString("F2"); - s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm); + s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss); s.LifePayTypeStr = s.LifePayType.GetDescription(); s.PayStatusStr = s.PayStatus.GetDescription(); s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2"); - s.LifePayRefundStatusStr = s.LifePayRefundStatusStr.GetDescription(); + s.LifePayRefundStatusStr = s.LifePayRefundStatus.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); + s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss); }); return result; } @@ -830,6 +833,8 @@ var rate = await GetRate(); CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�"); + //var rate = await GetLifePayRate(); + var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸).Rate); var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵d环); @@ -850,8 +855,10 @@ RechargeAmount = amount.RechargeAmount, ChannelId = channle.ChannlesNum, PlatformRate = platformRate.Rate, + PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate /100, ChannleRate = channle.ChannlesRate, ChannlesRakeRate = channle.ChannlesRakeRate, + //ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100 }; await CreateLifePayOrder(orderInput); @@ -1264,6 +1271,24 @@ await _lifePayOrderRepository.UpdateAsync(order); } + public async Task WxPayDomesticRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus) + { + var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync(); + CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�"); + order.LifePayRefundStatus = refundStatus; + switch (refundStatus) + { + case LifePayRefundStatusEnum.宸查��娆�: + order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�; + order.ACOOLYStatus = ACOOLYStatusEnum.宸查��娆�; + break; + case LifePayRefundStatusEnum.閫�娆句腑: + order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑; + break; + default:break; + } + } + /// <summary> /// ACOOLYO璁㈠崟閫氱煡澶勭悊 /// </summary> @@ -1285,6 +1310,12 @@ { order.ACOOLYOrderNo = acoolyOrderNo; } + + if (status == LifePayOrderStatusEnum.寰呴��娆�) + { + order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�; + } + if (refundApplyRemark.IsNotNullOrEmpty()) { order.RefundApplyRemark = refundApplyRemark; @@ -1292,7 +1323,7 @@ order.LifePayOrderStatus = status; order.ACOOLYStatus = acoolyStatus; - + order.FinishTime = DateTime.Now; await _lifePayOrderRepository.UpdateAsync(order); } @@ -1353,14 +1384,17 @@ order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�; order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�; } + break; case LifePayTypeEnum.AliPay: - var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice * 100).ToString() }); + var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice).ToString() }); if (aliRefundResult.Code != AlipayResultCode.Success) { - throw new UserFriendlyException("閫�娆惧け璐�"); + throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg); } + order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�; + order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�; break; default: throw new UserFriendlyException("閫�娆惧け璐�"); } @@ -1538,24 +1572,21 @@ var order = await _lifePayOrderRepository.FirstOrDefaultAsync(x => x.Id == input.Id); CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�"); - if(order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�) + if (order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�) { return; } - if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆�) + if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.寰呴��娆�) { - if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�) + if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�) { order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�; - } - else if (order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�煎け璐�) - { - order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�; } order.RefundCheckRemark = input.RefundCheckRemark; order.RefundCheckUserId = CurrentUser.Id; + order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆鹃┏鍥�; await _lifePayOrderRepository.UpdateAsync(order); @@ -1941,42 +1972,52 @@ private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayOrderListFilter(QueryLifePayOrderListInput input) { - var result = (from a in _lifePayOrderRepository.Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�) - .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime) + var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync(); + var result = (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository) + .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime) .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime) .WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime) + .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType) .WhereIf(input.EndPayTime.HasValue, x => x.PayTime <= input.EndPayTime) .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value) .WhereIf(input.PayStatus.HasValue, x => x.PayStatus == input.PayStatus.Value) + .WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value) .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value) .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value) - .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords)) - join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp - from b in temp.DefaultIfEmpty() - select new LifePayOrderListOutput - { - DiscountAmount = a.DiscountAmount, - FinishTime = a.FinishTime, - Id = a.Id, - LifePayOrderStatus = a.LifePayOrderStatus, - LifePayOrderType = a.LifePayOrderType, - LifePayType = a.LifePayType, - OrderNo = a.OrderNo, - PayAmount = a.PayAmount, - PhoneNumber = a.PhoneNumber, - RechargeAmount = a.RechargeAmount, - UserId = a.UserId, - OutOrderNo = a.OutOrderNo, - PayStatus = a.PayStatus, - PayTime = a.PayTime, - ACOOLYOrderNo = a.ACOOLYOrderNo, - RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(), - CreationTime = a.CreationTime, - RefundCheckRemark = a.RefundCheckRemark, - RefundApplyRemark = a.RefundApplyRemark, - RefundTime = a.RefundTime, - ChannelName = b.ChannlesName - }); + .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords) || channles.Contains(x.ChannelId)) + join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp + from b in temp.DefaultIfEmpty() + select new LifePayOrderListOutput + { + DiscountAmount = a.DiscountAmount, + FinishTime = a.FinishTime, + Id = a.Id, + LifePayOrderStatus = a.LifePayOrderStatus, + LifePayOrderType = a.LifePayOrderType, + LifePayType = a.LifePayType, + OrderNo = a.OrderNo, + PayAmount = a.PayAmount, + PhoneNumber = a.PhoneNumber, + RechargeAmount = a.RechargeAmount, + UserId = a.UserId, + OutOrderNo = a.OutOrderNo, + PayStatus = a.PayStatus, + PayTime = a.PayTime, + ACOOLYOrderNo = a.ACOOLYOrderNo, + RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(), + RefundPrice = a.RefundPrice, + CreationTime = a.CreationTime, + RefundCheckRemark = a.RefundCheckRemark, + RefundApplyRemark = a.RefundApplyRemark, + RefundTime = a.RefundTime, + ChannelName = b.ChannlesName, + ActualRechargeAmount = a.ActualRechargeAmount, + PlatformDeductionAmount = a.PlatformDeductionAmount, + ACOOLYStatus = a.ACOOLYStatus, + LifePayRefundStatus = a.LifePayRefundStatus, + }); + + return result; } @@ -1984,9 +2025,9 @@ { var result = (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository) .Where(x => x.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆句腑 - || x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆�) - .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime) - .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime) + || (x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆� && x.LifePayRefundStatus != LifePayRefundStatusEnum.閫�娆鹃┏鍥�)) + .WhereIf(input.BeginRefundTime.HasValue, x => x.RefundTime >= input.BeginRefundTime) + .WhereIf(input.EndRefundTime.HasValue, x => x.RefundTime <= input.EndRefundTime) .WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime) .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType) .WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime) @@ -2046,5 +2087,50 @@ }); } + public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal? platformRate,decimal? channleRate, + decimal? channlesRakeRate,decimal? premiumRate) + { + /// 姣涘埄 + var grossProfit = price * (channleRate - platformRate) / 100; + + /// 骞冲彴鎵f閲戦 鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥 + var platformPrice = price * platformRate / 100; + + /// 鎵嬬画璐� + var premiumPrice = priceAmount * premiumRate / 100; + + /// 娓犻亾浣i噾 锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣i噾姣斾緥 + var channlesRakePrice = grossProfit * channlesRakeRate / 100; + + /// 鍒╂鼎 + var profit = grossProfit - channlesRakePrice - premiumPrice; + + return new OrderPriceReturn() + { + PlatformPrice = platformPrice.HasValue? platformPrice.Value :0, + PremiumPrice = premiumPrice.HasValue ? premiumPrice.Value : 0, + ChannlesRakePrice = channlesRakePrice.HasValue? channlesRakePrice.Value:0, + Profit = profit.HasValue ? profit.Value : 0 + }; + } + + public async Task<decimal> GetLifePayRate(string channelId, LifePayRateTypeEnum lifePayRateType) + { + if (string.IsNullOrEmpty(channelId)) + { + var rate = await GetRate(); + CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�"); + var result = rate.FirstOrDefault(x => x.RateType == lifePayRateType).Rate; + return result; + } + else + { + var channel = await _lifePayChannlesRep.Where(x => x.ChannlesNum == channelId).FirstOrDefaultAsync(); + + CheckExtensions.IfTrueThrowUserFriendlyException(channel == null, "鏈壘鍒板搴旀笭閬�"); + return channel.ChannlesRate; + } + } + #endregion } -- Gitblit v1.9.1