LifePaymentApi.git

			@@ -530,6 +530,7 @@
			CreationTime = x.CreationTime,
			RefundCheckRemark = x.RefundCheckRemark,
			RefundApplyRemark = x.RefundApplyRemark,
			RefundApplyTime = x.RefundApplyTime,
			RefundTime = x.RefundTime,
			ACOOLYOrderNo = x.ACOOLYOrderNo,
			LifePayRefundStatus = x.LifePayRefundStatus,
			@@ -832,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);

			@@ -1570,19 +1573,16 @@
			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);

			@@ -1760,10 +1760,10 @@
			private (decimal PayAmont, decimal DiscountAmount, decimal RechargeAmount) CalculateAmount(decimal amount, decimal rate)
			{
			/// 正常支付
			var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
			//var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);

			/// 1分钱支付
			//decimal payAmount = 0.01m;
			decimal payAmount = 0.01m;

			CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "支付金额错误");

			@@ -2100,5 +2100,23 @@
			};
			}

			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
			}