fix:新增在线客服配置、户号编辑功能优化、用户列表更新

zhengyuxuan

2025-03-27 72ed026e6dc651e7bd1f77f41face93a7a9f49cb

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -402,8 +402,8 @@
        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);
        CheckExtensions.IfTrueThrowUserFriendlyException(user == null, "用户不存在");
        var orderpirce = await GetOrderPrice(order.RechargeAmount, order.PayAmount, order.PlatformRate ?? 0, order.ChannleRate ?? 0, order.ChannlesRakeRate ?? 0, order.PremiumRate ?? 0);


        var result = new LifePayOrderOutput()
@@ -442,7 +442,8 @@
            ChannlesRakePrice = orderpirce.ChannlesRakePrice,
            PremiumRate = order.PremiumRate,
            PremiumPrice = orderpirce.PremiumPrice,
            Profit = orderpirce.Profit
            Profit = orderpirce.Profit,
            RefundOrderNo = order.RefundOrderNo,
        };

        return result;
@@ -729,7 +730,7 @@
        {
            DiscountAmount = x.DiscountAmount,
            FinishTime = x.FinishTime,
            //LifePayOrderStatus = x.LifePayOrderStatus,
            LifePayOrderStatus = x.LifePayOrderStatus,
            LifePayOrderType = x.LifePayOrderType,
            LifePayType = x.LifePayType,
            OrderNo = x.OrderNo,
@@ -762,7 +763,7 @@
            s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
            s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.无需退款 ? "" : s.LifePayRefundStatus.GetDescription();
            s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
            //s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
            s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
            s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
        });
        return result;
@@ -860,7 +861,7 @@
            RechargeAmount = amount.RechargeAmount,
            ChannelId = channle.ChannlesNum,
            PlatformRate = platformRate.Rate,
            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate /100,
            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
            ChannleRate = rate,
            ChannlesRakeRate = channle.ChannlesRakeRate,
            //ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100
@@ -1124,7 +1125,7 @@
#endif

        CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));
                                                        result.Message);

        return (result.Code, requestInput.RequestNo, result.PhoneChargeOrder.BusiOrderNo);
    }
@@ -1155,7 +1156,7 @@
#endif

        CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));
                                                        result.Message);

        return (result.Code, requestInput.RequestNo, result.ElectricChargeOrder.BusiOrderNo);
    }
@@ -1183,7 +1184,7 @@
#endif

        CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));
                                                        result.Message);

        return (result.Code, requestInput.RequestNo, result.GasChargeOrder.BusiOrderNo);
    }
@@ -1301,6 +1302,7 @@
            _logger.LogError(ex, "处理生活缴费支付成功回调时异常");
            order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;
            order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;
            order.RefundApplyRemark = ex.Message;
        }
        _logger.LogError("生活缴费订单状态：" + order.LifePayOrderStatus.ToString());
        await _lifePayOrderRepository.UpdateAsync(order);
@@ -1320,7 +1322,7 @@
            case LifePayRefundStatusEnum.退款中:
                order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;
                break;
            default:break;
            default: break;
        }
    }

@@ -1330,7 +1332,7 @@
    /// <param name="orderNo"></param>
    /// <param name="outOrderNo"></param>
    /// <returns></returns>
    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount,string refundApplyRemark)
    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark)
    {
        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");
@@ -1398,7 +1400,7 @@
        switch (order.LifePayType)
        {
            case LifePayTypeEnum.WxPay:
                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo,order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 100), Convert.ToInt32(order.PayAmount * 100));
                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo, order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 100), Convert.ToInt32(order.PayAmount * 100));
                if (wxRefundResult.Status == "SUCCESS")
                {
                    order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
@@ -1500,7 +1502,7 @@
    /// <param name="total"></param>
    /// <param name="currency"></param>
    /// <returns></returns>
    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo,string outRefundNo, string reason, int refund, int total, string currency = "CNY")
    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string outRefundNo, string reason, int refund, int total, string currency = "CNY")
    {
        WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest
        {
@@ -1535,7 +1537,7 @@
            var userAccount = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.Id == input.Id)
                                            .FirstOrDefaultAsync();
            CheckExtensions.IfTrueThrowUserFriendlyException(userAccount == null, "户号不存在");
            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id)
            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id && x.IsDeleted == false)
                                            .FirstOrDefaultAsync();
            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "户号已存在");

@@ -1549,22 +1551,36 @@
        }
        else
        {
            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content)
            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.IsDeleted == false)
                                            .FirstOrDefaultAsync();
            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "户号已存在");
            var userAccount = new LifePayAccount
            /// CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "户号已存在");
            if (repeatAccountContent != null)
            {
                Id = Guid.NewGuid(),
                UserId = input.UserId,
                Content = input.Content,
                Province = input.Province,
                LifePayType = input.LifePayType,
                City = input.City,
                Remark = input.Remark,
                Operators = input.Operators,
                ExtraProperties = input.ExtraProperties,
            };
            await _lifePayAccount.InsertAsync(userAccount);
                repeatAccountContent.LifePayType = input.LifePayType;
                repeatAccountContent.Content = input.Content;
                repeatAccountContent.Province = input.Province;
                repeatAccountContent.City = input.City;
                repeatAccountContent.Remark = input.Remark;
                repeatAccountContent.Operators = input.Operators;
                repeatAccountContent.ExtraProperties = input.ExtraProperties;
            }
            else
            {
                var userAccount = new LifePayAccount
                {
                    Id = Guid.NewGuid(),
                    UserId = input.UserId,
                    Content = input.Content,
                    Province = input.Province,
                    LifePayType = input.LifePayType,
                    City = input.City,
                    Remark = input.Remark,
                    Operators = input.Operators,
                    ExtraProperties = input.ExtraProperties,
                };
                await _lifePayAccount.InsertAsync(userAccount);
            }
            
        }

        if (input.LifePayType == LifePayOrderTypeEnum.话费订单)
@@ -1654,7 +1670,7 @@
            dto.Status = input.Status;
            #region 记录日志

            await PublishLifePayOrderHistoryEvent("渠道管理", "编辑", input.Id.Value, TableType.LifePayChannles);
            await LifePayOrderHistory("渠道管理", "编辑", input.Id.Value, TableType.LifePayChannles);

            #endregion
        }
@@ -1667,7 +1683,7 @@

            #region 记录日志

            await PublishLifePayOrderHistoryEvent("渠道管理", "新增", input.Id.Value, TableType.LifePayChannles);
            await LifePayOrderHistory("渠道管理", "新增", input.Id.Value, TableType.LifePayChannles);

            #endregion
        }
@@ -1684,8 +1700,7 @@

        #region 记录日志

        await PublishLifePayOrderHistoryEvent("渠道管理", status.GetDescription(), id, TableType.LifePayChannles);

        await LifePayOrderHistory("渠道管理", status.GetDescription(), id, TableType.LifePayChannles);
        #endregion
    }

@@ -1799,10 +1814,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, "支付金额错误");

@@ -2021,39 +2036,39 @@
                                            .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.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,
                            });
                      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;
    }

@@ -2072,40 +2087,40 @@
                                         .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,
                                RefundApplyTime = a.RefundApplyTime,
                                RefundTime = a.RefundTime,
                                RefundOrderNo = a.RefundOrderNo,
                                RefundPrice = a.RefundPrice,
                                ChannelName = b.ChannlesName,
                                ActualRechargeAmount = a.ActualRechargeAmount,
                                PlatformDeductionAmount = a.PlatformDeductionAmount,
                                ACOOLYStatus = a.ACOOLYStatus,
                                LifePayRefundStatus = a.LifePayRefundStatus,
                                ActualReceivedAmount = a.ActualReceivedAmount.HasValue? a.ActualReceivedAmount.Value : 0
                            });
                      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,
                          RefundApplyTime = a.RefundApplyTime,
                          RefundTime = a.RefundTime,
                          RefundOrderNo = a.RefundOrderNo,
                          RefundPrice = a.RefundPrice,
                          ChannelName = b.ChannlesName,
                          ActualRechargeAmount = a.ActualRechargeAmount,
                          PlatformDeductionAmount = a.PlatformDeductionAmount,
                          ACOOLYStatus = a.ACOOLYStatus,
                          LifePayRefundStatus = a.LifePayRefundStatus,
                          ActualReceivedAmount = a.ActualReceivedAmount.HasValue ? a.ActualReceivedAmount.Value : 0
                      });
        return result;
    }
    private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter()
@@ -2124,8 +2139,8 @@
                    });
    }

    public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal? platformRate,decimal? channleRate,
        decimal? channlesRakeRate,decimal? premiumRate)
    public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal platformRate, decimal channleRate,
        decimal channlesRakeRate, decimal premiumRate)
    {
        /// 毛利
        var grossProfit = price * (channleRate - platformRate) / 100;
@@ -2134,20 +2149,20 @@
        var platformPrice = price * platformRate / 100;

        /// 手续费
        var premiumPrice = priceAmount * premiumRate / 100;
        var premiumPrice = priceAmount * (premiumRate) / 100;

        /// 渠道佣金  （(充值面额 * 渠道折扣比例)-(充值面额 * 平台折扣比例)）* 佣金比例
        var channlesRakePrice = grossProfit * channlesRakeRate / 100;
        var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;

        /// 利润
        var profit = grossProfit - channlesRakePrice - premiumPrice;
        var profit = grossProfit - channlesRakePrice - (premiumRate);

        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
            PlatformPrice = platformPrice,
            PremiumPrice = premiumPrice,
            ChannlesRakePrice = channlesRakePrice,
            Profit = profit
        };
    }