feat:1.4相关修改

sunpengfei

2025-06-09 1c5d47ed2fb8e2dac617676ac1f489cc6e3483af

feat:1.4相关修改

 LifePayment/LifePayment.Application.Contracts/Promoter/PromoterDto.cs

@@ -9,6 +9,20 @@
{
    public class GetPromotersInput : PageInput
    {
        /// <summary>
        /// 创建的开始时间
        /// </summary>
        public DateTime? StartDate { get; set; }

        /// <summary>
        /// 创建的结束时间
        /// </summary>
        public DateTime? EndDate { get; set; }

        /// <summary>
        /// 搜索关键词
        /// </summary>
        public string SearchKey { get; set; }
    }

    public class PromoterDto

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -1376,12 +1376,12 @@
        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");

        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已完成)
        {
            return;
        }
        //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已完成)
        //{
        //    return;
        //}

         //order.PlatformDeductionAmount = payAmount;
        order.ActualReceivedAmount = actualParValue;

        if (acoolyOrderNo.IsNotNullOrEmpty())
        {
@@ -1404,6 +1404,8 @@
            || order.LifePayOrderStatus == LifePayOrderStatusEnum.已退款)
        {
            order.FinishTime = DateTime.Now;
            order.PlatformDeductionAmount = order.ActualReceivedAmount * order.PlatformRate / 100;
            order.RefundPrice = Math.Round((1 - ((order.ActualReceivedAmount ?? 0) / (order.RechargeAmount ?? 0))) * (order.PayAmount ?? 0), 2);
        }

        await _lifePayOrderRepository.UpdateAsync(order);

 LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelAgentType.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -14,16 +15,19 @@
        /// <summary>
        /// 零售代理
        /// </summary>
        [Description("零售代理")]
        RetailAgent = 1,

        /// <summary>
        /// 品牌代理
        /// </summary>
        [Description("品牌代理")]
        BrandAgent = 2,

        /// <summary>
        /// 区域代理
        /// </summary>
        [Description("区域代理")]
        AreaAgent = 3
    }
}

 LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelConsultationFollowupStatus.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -11,21 +12,25 @@
        /// <summary>
        /// 未回访
        /// </summary>
        None = 0,
        [Description("未回访")]
        None = 1,

        /// <summary>
        /// 跟进中
        /// </summary>
        Ing = 1,
        [Description("跟进中")]
        Ing = 2,

        /// <summary>
        /// 已拒绝
        /// </summary>
        Refuse = 1,
        [Description("已拒绝")]
        Refuse = 3,

        /// <summary>
        /// 已开通
        /// </summary>
        Open = 1,
        [Description("已开通")]
        Open = 4,
    }
}