生活缴费api
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhengyuxuan
2025-03-25 6d1e4f9293f2c3287263a3f10bc842656037da02 
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs


@@ -246,6 +246,7 @@


    {


        var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();


        var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)


                            .Where(x => x.PayStatus != LifePayStatusEnum.未支付)


                      .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)


@@ -732,7 +733,7 @@


            LifePayType = x.LifePayType,


            OrderNo = x.OrderNo,


            PayAmount = x.PayAmount,


            ActualRechargeAmount = x.ActualRechargeAmount.HasValue?x.ActualRechargeAmount.Value:0,


            ActualRechargeAmount = x.RechargeAmount,


            PhoneNumber = x.PhoneNumber,


            RechargeAmount = x.RechargeAmount,


            OutOrderNo = x.OutOrderNo,


@@ -758,7 +759,7 @@


            s.LifePayTypeStr = s.LifePayType.GetDescription();


            s.PayStatusStr = s.PayStatus.GetDescription();


            s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");


            s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription();


            s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.无需退款 ? "" : 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.yyyyMMddHHmmss);


@@ -833,12 +834,12 @@


        var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);


        CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "渠道不存在");




        var rate = await GetRate();


        CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");


        //var rate = await GetRate();


        //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");




        //var rate = await GetLifePayRate();


        var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.默认话费折扣);




        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.默认话费折扣).Rate);


        var amount = CalculateAmount(input.ProductData.ParValue, rate);




        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.供应商折扣价);


        


@@ -859,7 +860,7 @@


            ChannelId = channle.ChannlesNum,


            PlatformRate = platformRate.Rate,


            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate /100,


            ChannleRate = channle.ChannlesRate,


            ChannleRate = rate,


            ChannlesRakeRate = channle.ChannlesRakeRate,


            //ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100


        };


@@ -887,10 +888,13 @@


        CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "渠道不存在");


        CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.禁用, "渠道已被禁用");




        var rate = await GetRate();


        CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");


        //var rate = await GetRate();


        //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");




        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.默认电费折扣).Rate);




        var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.默认电费折扣);




        var amount = CalculateAmount(input.ProductData.ParValue, rate);




        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.供应商折扣价);




@@ -909,7 +913,7 @@


            RechargeAmount = amount.RechargeAmount,


            ChannelId = channle.ChannlesNum,


            PlatformRate = platformRate.Rate,


            ChannleRate = channle.ChannlesRate,


            ChannleRate = rate,


            ChannlesRakeRate = channle.ChannlesRakeRate,


        };




@@ -936,10 +940,13 @@


        CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "渠道不存在");


        CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.禁用, "渠道已被禁用");




        var rate = await GetRate();


        CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");


        //var rate = await GetRate();


        //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");




        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.默认燃气折扣).Rate);




        var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.默认燃气折扣);




        var amount = CalculateAmount(input.ProductData.ParValue, rate);




        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.供应商折扣价);




@@ -956,7 +963,10 @@


            PayAmount = amount.PayAmont,


            DiscountAmount = amount.DiscountAmount,


            RechargeAmount = amount.RechargeAmount,


            ChannelId = channle.ChannlesNum


            ChannelId = channle.ChannlesNum,


            PlatformRate = platformRate.Rate,


            ChannleRate = rate,


            ChannlesRakeRate = channle.ChannlesRakeRate,


        };




        await CreateLifePayOrder(orderInput);


@@ -1013,7 +1023,7 @@


    }




    /// <summary>


    /// 设置生活缴费支付类型


    /// 获取微信支付的JSAPI


    /// </summary>


    /// <param name="input"></param>


    /// <returns></returns>


@@ -1025,6 +1035,8 @@


        CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "当前订单已选择支付类型");




        order.LifePayType = input.LifePayType;


        var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();


        order.PremiumRate = premium == null ? 0 : premium.Rate;


        await _lifePayOrderRepository.UpdateAsync(order);




        var desc = "生活缴费-";


@@ -1977,6 +1989,7 @@


    {


        var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();


        var result = (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)


                            .Where(x => x.PayStatus != LifePayStatusEnum.未支付)


                      .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)


@@ -2064,6 +2077,7 @@


                                RefundApplyRemark = a.RefundApplyRemark,


                                RefundApplyTime = a.RefundApplyTime,


                                RefundTime = a.RefundTime,


                                RefundOrderNo = a.RefundOrderNo,


                                RefundPrice = a.RefundPrice,


                                ChannelName = b.ChannlesName,


                                ActualRechargeAmount = a.ActualRechargeAmount,


@@ -2117,9 +2131,9 @@


        };


    }




    public async Task<decimal> GetLifePayRate(string channelId, LifePayRateTypeEnum lifePayRateType)


    public async Task<decimal> GetLifePayRate(CreateEditPayChannelsInput channel, LifePayRateTypeEnum lifePayRateType)


    {


        if (string.IsNullOrEmpty(channelId))


        if (channel == null)


        {


            var rate = await GetRate();


            CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");


@@ -2128,9 +2142,6 @@


        }


        else


        {


            var channel = await _lifePayChannlesRep.Where(x => x.ChannlesNum == channelId).FirstOrDefaultAsync();




            CheckExtensions.IfTrueThrowUserFriendlyException(channel == null, "未找到对应渠道");


            return channel.ChannlesRate;


        }


    }