实际到账金额

zhengyuxuan

2025-03-21 f7b25f51b37f227120690dafb890e5669e632372

实际到账金额

 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs

@@ -577,6 +577,11 @@
    public decimal? ActualRechargeAmount { get; set; }

    /// <summary>
    /// 实际到账金额
    /// </summary>
    public decimal? ActualReceivedAmount { get; set; }

    /// <summary>
    /// 退款金额
    /// </summary>
    public decimal? RefundPrice { get; set; }

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -1235,8 +1235,6 @@
            return;
        }

        order.LifePayOrderStatus = status;
        order.ACOOLYStatus = acoolyStatus;
        order.PlatformDeductionAmount = payAmount;
        if (acoolyOrderNo.IsNotNullOrEmpty())
        {
@@ -1253,6 +1251,8 @@
            order.PayStatus = LifePayStatusEnum.待退款;
        }

        order.LifePayOrderStatus = status;
        order.ACOOLYStatus = acoolyStatus;

        await _lifePayOrderRepository.UpdateAsync(order);
    }

 LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs

@@ -148,6 +148,11 @@
        public decimal? ActualRechargeAmount { get; set; }

        /// <summary>
        /// 实际到账金额
        /// </summary>
        public decimal? ActualReceivedAmount { get; set; }

        /// <summary>
        /// 平台退款状态
        /// </summary>
        public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }

 LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs

@@ -52,8 +52,8 @@
            }
            var baseInfo = JsonConvert.DeserializeObject<ACOOLYRequestBaseResponse>(body);
            var orderNo = string.Empty;
            var status = LifePayOrderStatusEnum.待确认;
            var acoolyStatus = ACOOLYStatusEnum.充值失败;
            LifePayOrderStatusEnum status = LifePayOrderStatusEnum.已失败;
            ACOOLYStatusEnum acoolyStatus = ACOOLYStatusEnum.充值失败;
            var acoolyOrderNo = string.Empty;
            decimal payAmount = 0;
            _logger.LogError("ACOOLY回调通处理类型：" + baseInfo.Service);
@@ -74,14 +74,12 @@
                        acoolyStatus = ACOOLYStatusEnum.充值失败;
                    }
                    else

                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.充值成功)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        acoolyStatus = ACOOLYStatusEnum.充值成功;
                    }
                    else

                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.充值中)
                    {
                        status = LifePayOrderStatusEnum.待确认;
@@ -215,7 +213,7 @@
                    }
                    break;
                default:
                    break;
                    throw new UserFriendlyException("ACOOLY回调通处理类型不存在");
            }

            await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount);