From ad8e329a739839bf5ce80b42d931b655c2c20356 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期一, 09 六月 2025 15:40:30 +0800 Subject: [PATCH] feat:新增接口x2 GET/api/Promoter/GetChannelConsultationById获取渠道咨询Id GET/api/Promoter/GetPromoter获取推广员信息 --- LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs index 0aef80f..25fc798 100644 --- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs +++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs @@ -130,6 +130,16 @@ } /// <summary> + /// 璇濊垂璁㈠崟鏌ヨ + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input) + { + return await _aCOOLYManager.QueryPhoneOrder(input); + } + + /// <summary> /// 鑾峰彇璇濊垂闈㈠�� /// </summary> /// <param name="input"></param> @@ -353,6 +363,7 @@ RefundPrice = a.RefundPrice, ChannelName = b.ChannlesName, ActualRechargeAmount = a.RechargeAmount, + ActualReceivedAmount = a.ActualReceivedAmount, PlatformDeductionAmount = a.PlatformDeductionAmount, ACOOLYStatus = a.ACOOLYStatus, LifePayRefundStatus = a.LifePayRefundStatus, @@ -453,6 +464,7 @@ PremiumPrice = orderpirce.PremiumPrice, Profit = orderpirce.Profit, RefundOrderNo = order.RefundOrderNo, + ActualReceivedAmount = order.ActualReceivedAmount }; return result; @@ -1376,10 +1388,11 @@ var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync(); CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�"); - //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�) - //{ - // return; - //} + if (order.LifePayOrderStatus == status && order.ACOOLYStatus == acoolyStatus) + { + _logger.LogInformation($"璁㈠崟锛坽orderNo}锛夊凡澶勭悊璇ョ姸鎬�"); + return; + } order.ActualReceivedAmount = actualParValue; @@ -1404,7 +1417,7 @@ || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�) { order.FinishTime = DateTime.Now; - order.PlatformDeductionAmount = order.ActualReceivedAmount * order.PlatformRate / 100; + order.PlatformDeductionAmount = Math.Round((order.ActualReceivedAmount ?? 0) * (order.PlatformRate ?? 0) / 100, 2); order.RefundPrice = Math.Round((1 - ((order.ActualReceivedAmount ?? 0) / (order.RechargeAmount ?? 0))) * (order.PayAmount ?? 0), 2); } @@ -1515,6 +1528,8 @@ order.RefundTime = DateTime.Now; order.RefundCheckUserId = CurrentUser.Id; order.RefundPrice = input.RefundPrice; + order.ActualReceivedAmount = Math.Round((1 - ((order.RefundPrice ?? 0) / (order.PayAmount ?? 0))) * (order.RechargeAmount ?? 0), 2); + order.PlatformDeductionAmount = Math.Round((order.ActualReceivedAmount ?? 0) * (order.PlatformRate ?? 0) / 100, 2); //await _lifePayOrderRepository.UpdateAsync(order); -- Gitblit v1.9.1