Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

lingling

2025-03-19 b525fe659614934f253ed9c8b59c38cfebb3bc15

Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

 LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs

@@ -113,15 +113,46 @@

    Task SetLifePayChannelsStatus(Guid id, LifePayChannelsStatsEnum status);

    /// <summary>
    /// ç¼–辑折扣
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    Task CreateEditLifePayRate(List<LifePayRateInput> input);

    /// <summary>
    /// ç¼–辑手续费费率
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    Task CreateEditLifePayPremium(List<LifePayPremiumInput> input);

    /// <summary>
    /// é¡»çŸ¥é…ç½®
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    Task EditIntroInfo(LifePayIntroInfoInput input);

    /// <summary>
    /// èŽ·å–折扣
    /// </summary>
    /// <returns></returns>
    Task<List<LifePayRateListOutput>> GetRate();

    /// <summary>
    /// èŽ·å–手续费费率
    /// </summary>
    /// <returns></returns>
    Task<List<LifePayPremiumListOutput>> GetPremium();

    /// <summary>
    /// èŽ·å–须知
    /// </summary>
    /// <returns></returns>
    Task<List<LifePayIntroInfoOutput>> GetIntroInfo(LifePayOrderTypeEnum type);

    /// <summary>
    /// èŽ·å–我的订单分页数据
    /// </summary>
    /// <param name="input"></param>
@@ -171,6 +202,8 @@
    /// <returns></returns>
    Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input);

    Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList();

    Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id);



 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs

@@ -315,6 +315,8 @@

    public decimal ChannlesRate { get; set; }

    public decimal ChannlesRakeRate { get; set; }

    public LifePaySwitchTypeEnum SwitchType { get; set; }

    public LifePayChannelsStatsEnum Status { get; set; }

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

@@ -1,5 +1,6 @@
using LifePayment.Domain.Shared;
using System;
using System.Collections.Generic;
using ZeroD.Base.Web.Models;

namespace LifePayment.Application.Contracts;
@@ -21,6 +22,98 @@

    public Guid? Id { get; set; }
}
public class LifePayPremiumInput
{
    public LifePayTypeEnum PremiumType { get; set; }

    public decimal Rate { get; set; }

    public Guid? Id { get; set; }
}

public class LifePayIntroInfoInput
{
    /// <summary>
    /// ç”Ÿæ´»ç¼´è´¹ç±»åž‹
    /// </summary>
    public LifePayOrderTypeEnum LifePayType { get; set; }

    /// <summary>
    /// æ›´æ–°å†…容
    /// </summary>
    public List<LifePayIntroInfoDetail> Data { get; set; }
}

public class LifePayIntroInfoDetail
{
    /// <summary>
    /// ç±»åž‹
    /// </summary>
    public IntroInfoTypeEnum Type { get; set; }

    /// <summary>
    /// æ‘˜è¦
    /// </summary>
    public string ContentSummary { get; set; }

    /// <summary>
    /// æ–‡æœ¬å†…容
    /// </summary>
    public string Content { get; set; }

    /// <summary>
    /// å›¾ç‰‡/视频路径
    /// </summary>
    public string Path { get; set; }

    /// <summary>
    /// æŽ’序
    /// </summary>
    public int Sequence { get; set; }
}

public class LifePayPremiumListOutput
{
    public LifePayTypeEnum PremiumType { get; set; }

    public decimal Rate { get; set; }

    public Guid Id { get; set; }
}

public class LifePayIntroInfoOutput
{
    /// <summary>
    /// ç±»åž‹
    /// </summary>
    public IntroInfoTypeEnum Type { get; set; }


    /// <summary>
    /// ç”Ÿæ´»ç¼´è´¹ç±»åž‹
    /// </summary>
    public LifePayOrderTypeEnum LifePayType { get; set; }

    /// <summary>
    /// æ‘˜è¦
    /// </summary>
    public string ContentSummary { get; set; }

    /// <summary>
    /// æ–‡æœ¬å†…容
    /// </summary>
    public string Content { get; set; }

    /// <summary>
    /// å›¾ç‰‡/视频路径
    /// </summary>
    public string Path { get; set; }

    /// <summary>
    /// æŽ’序
    /// </summary>
    public int Sequence { get; set; }
}

public class UserListOutput
{
@@ -31,6 +124,16 @@
    /// </summary>
    public string PhoneNumber { get; set; }

    /// <summary>
    /// æœ€åŽç™»å½•æ¸ é“
    /// </summary>
    public string CreationChannle { get; set; }

    /// <summary>
    /// æœ€åŽç™»å½•æ¸ é“
    /// </summary>
    public string LastLoginChannle { get; set; }

    public DateTime? LastLoginTime { get; set; }

    public DateTime? CreationTime { get; set; }

 LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs

@@ -29,6 +29,11 @@
        public string[] RoleNames { get; set; }

        /// <summary>
        /// æ¸ é“列表
        /// </summary>
        public Guid[] ChannlesId { get; set; }

        /// <summary>
        /// ç»„织架构公司id
        /// </summary>
        public Guid? CompanyOrgId { get; set; }
@@ -131,6 +136,12 @@
        /// </summary>
        public IEnumerable<RoleDto> Roles { get; set; }


        /// <summary>
        /// è§’色信息
        /// </summary>
        public IEnumerable<UserChannleDto> Channles { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
@@ -215,6 +226,19 @@
        public string Remark { get; set; }
    }

    public class UserChannleDto
    {
        /// <summary>
        /// æ¸ é“Id
        /// </summary>
        public Guid Id { get; set; }

        /// <summary>
        /// æ¸ é“名
        /// </summary>
        public string Name { get; set; }
    }

    public class GetRolesInput : PageInput
    {
        /// <summary>

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -25,9 +25,10 @@
using ZeroD.Util;
using ZeroD.Util.Fadd;
using static LifePayment.Domain.Shared.LifePaymentConstant;
using static IdentityServer4.Models.IdentityResources;
using Volo.Abp.Data;
using Z.EntityFramework.Plus;
using LifePayment.Domain.LifePay;
using pingan.openbank.api.sdk.enums;

namespace LifePayment.Application;

@@ -37,8 +38,10 @@
    private readonly ILogger<LifePayService> _logger;

    private readonly IRepository<LifePayRate, Guid> _lifePayRateRepository;
    private readonly IRepository<LifePayPremium, Guid> _lifePayPremiumRepository;
    private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
    private readonly IRepository<LifePayUser, Guid> _lifePayUserRepository;
    private readonly IRepository<LifePayIntroInfo, Guid> _lifePayIntroInfoRepository;
    private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
    private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
    private readonly IDataFilter dataFilter;
@@ -55,6 +58,8 @@
                          IRepository<LifePayRate, Guid> lifePayRateRepository,
                          IRepository<LifePayOrder, Guid> lifePayOrderRepository,
                          IRepository<LifePayUser, Guid> lifePayUserRepository,
                          IRepository<LifePayPremium, Guid> lifePayPremiumRepository,
                          IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
                          IAliPayApi aliPayApi,
                          IWxPayApi wxPayApi,
                          IOptions<WxPayOption> wxPayOptions,
@@ -67,6 +72,8 @@
        _lifePayRateRepository = lifePayRateRepository;
        _lifePayOrderRepository = lifePayOrderRepository;
        _lifePayUserRepository = lifePayUserRepository;
        _lifePayPremiumRepository = lifePayPremiumRepository;
        _lifePayIntroInfoRepository = lifePayIntroInfoRepository;
        _aliPayApi = aliPayApi;
        _wxPayApi = wxPayApi;
        _wxPayOptions = wxPayOptions.Value;
@@ -137,16 +144,40 @@
    }

    /// <summary>
    /// èŽ·å–手续费费率
    /// </summary>
    /// <returns></returns>
    public async Task<List<LifePayPremiumListOutput>> GetPremium()
    {
        return await _lifePayPremiumRepository.Where(x => x.IsDeleted == false).Select(x => new LifePayPremiumListOutput() { Id = x.Id, Rate = x.Rate, PremiumType = x.PremiumType })
                                           .ToListAsync();
    }

    /// <summary>
    /// é¡»çŸ¥é…ç½®
    /// </summary>
    /// <returns></returns>
    public async Task<List<LifePayIntroInfoOutput>> GetIntroInfo(LifePayOrderTypeEnum lifePayType)
    {
        return await _lifePayIntroInfoRepository.Where(x => x.IsDeleted == false && x.LifePayType == lifePayType).OrderBy(x => x.Sequence)
            .Select(x => new LifePayIntroInfoOutput() { Type = x.Type, ContentSummary = x.ContentSummary, Content = x.Content, LifePayType = x.LifePayType,Path = x.Path,Sequence = x.Sequence })
                                           .ToListAsync();
    }

    /// <summary>
    /// èŽ·å–用户分页数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    public async Task<PageOutput<UserListOutput>> GetUserPage(PageInput input)
    {
        var channel = await _lifePayChannlesRep.ToListAsync();
        return await _lifePayUserRepository.Select(x =>
                                                   new UserListOutput()
                                                   {
                                                       Id = x.Id,
                                                       //CreationChannle = string.IsNullOrEmpty(x.CreationChannleNum) ? "" : channel.Where(c => c.ChannlesNum == x.CreationChannleNum).FirstOrDefault().ChannlesName,
                                                       //LastLoginChannle = string.IsNullOrEmpty(x.LastLoginChannleNum) ? "" : channel.Where(c => c.ChannlesNum == x.LastLoginChannleNum).FirstOrDefault().ChannlesName,
                                                       PhoneNumber = x.PhoneNumber,
                                                       CreationTime = x.CreationTime,
                                                       LastLoginTime = x.LastLoginTime
@@ -324,19 +355,12 @@

    public async Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input)
    {
        return await GetLifePayChannlesListFilter().GetPageResult(input.PageModel);
    }

        return await _lifePayChannlesRep.Select(x =>
                                                new CreateEditPayChannelsInput
    public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
                                                {
                                                    Id = x.Id,
                                                    ChannlesRate = x.ChannlesRate,
                                                    ChannlesName = x.ChannlesName,
                                                    ChannlesNum = x.ChannlesNum,
                                                    Status = x.Status,
                                                    SwitchType = x.SwitchType,
                                                    ChannlesType = x.ChannlesType,
                                                })
                                            .GetPageResult(input.PageModel);
        return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.启用).ToListAsync();
    }

    public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
@@ -346,6 +370,7 @@
                                                    {
                                                        Id = x.Id,
                                                        ChannlesRate = x.ChannlesRate,
                                                        ChannlesRakeRate = x.ChannlesRakeRate,
                                                        ChannlesName = x.ChannlesName,
                                                        ChannlesNum = x.ChannlesNum,
                                                        Status = x.Status,
@@ -361,6 +386,7 @@
                                                    {
                                                        Id = x.Id,
                                                        ChannlesRate = x.ChannlesRate,
                                                        ChannlesRakeRate = x.ChannlesRakeRate,
                                                        ChannlesName = x.ChannlesName,
                                                        ChannlesNum = x.ChannlesNum,
                                                        Status = x.Status,
@@ -1172,6 +1198,7 @@
            dto.ChannlesName = input.ChannlesName;
            dto.ChannlesNum = input.ChannlesNum;
            dto.ChannlesRate = input.ChannlesRate;
            dto.ChannlesRakeRate = input.ChannlesRakeRate;
            dto.SwitchType = input.SwitchType;
            dto.ChannlesType = input.ChannlesType;
            dto.Status = input.Status;
@@ -1219,6 +1246,7 @@
        CheckExtensions.IfTrueThrowUserFriendlyException(dto.Status == LifePayChannelsStatsEnum.禁用, "当前渠道商已禁用");
        return true;
    }

    public async Task CreateEditLifePayRate(List<LifePayRateInput> input)
    {
        CheckExtensions.IfTrueThrowUserFriendlyException(input.Where(r => r.Rate <= 0).Any(), "折扣不得小于等于0");
@@ -1248,11 +1276,62 @@
        {
            await _lifePayRateRepository.InsertManyAsync(listData);
        }

    }

    public async Task CreateEditLifePayPremium(List<LifePayPremiumInput> input)
    {
        CheckExtensions.IfTrueThrowUserFriendlyException(input.Where(r => r.Rate < 0).Any(), "折扣不得小于0");
        var listData = new List<LifePayPremium>();
        foreach (var item in input)
        {
            var tmpDto = await _lifePayPremiumRepository.FirstOrDefaultAsync(r => r.PremiumType == item.PremiumType);
            if (tmpDto != null)
            {
                tmpDto.Rate = item.Rate;
            }
            else
            {
                listData.Add(new LifePayPremium
                {
                    CreationTime = DateTime.Now,
                    Rate = item.Rate,
                    PremiumType = item.PremiumType,
                    Id = Guid.NewGuid(),
                });
            }
        }

        if (listData.Any())
        {
            await _lifePayPremiumRepository.InsertManyAsync(listData);
        }
    }

    public async Task EditIntroInfo(LifePayIntroInfoInput input)
    {
        var listData = new List<LifePayIntroInfo>();
        foreach (var item in input.Data)
        {
            var tmpDto = await _lifePayIntroInfoRepository.Where(r => r.LifePayType == input.LifePayType).DeleteAsync();

            listData.Add(new LifePayIntroInfo
            {
                LifePayType = input.LifePayType,
                CreationTime = DateTime.Now,
                Type = item.Type,
                ContentSummary = item.ContentSummary,
                Content = item.Content,
                Path = item.Path,
                Sequence = item.Sequence,
                Id = Guid.NewGuid(),
            });
        }

        if (listData.Any())
        {
            await _lifePayIntroInfoRepository.InsertManyAsync(listData);
        }
    }
    #endregion

    #region ç§æœ‰
@@ -1503,6 +1582,21 @@
        return result;
    }

    private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter()
    {
        return _lifePayChannlesRep.Select(x =>
                    new CreateEditPayChannelsInput
                    {
                        Id = x.Id,
                        ChannlesRate = x.ChannlesRate,
                        ChannlesRakeRate = x.ChannlesRakeRate,
                        ChannlesName = x.ChannlesName,
                        ChannlesNum = x.ChannlesNum,
                        Status = x.Status,
                        SwitchType = x.SwitchType,
                        ChannlesType = x.ChannlesType,
                    });
    }

    #endregion
}

 LifePayment/LifePayment.Application/User/AccountService.cs

@@ -92,6 +92,7 @@
                lifeUser = new LifePayUser()
                {
                    Id = GuidGenerator.Create(),
                    CreationChannleNum = input.CheckChannelId,
                    PhoneNumber = input.PhoneNumber,
                    LastLoginTime = DateTime.Now
                };
@@ -100,6 +101,7 @@
            }
            else
            {
                lifeUser.LastLoginChannleNum = input.CheckChannelId;
                lifeUser.LastLoginTime = DateTime.Now;
                await _lifePayUserRepository.UpdateAsync(lifeUser);
            }

 LifePayment/LifePayment.Application/User/UserRoleService.cs

@@ -1,4 +1,5 @@
using LifePayment.Application.Contracts;
using LifePayment.Domain;
using LifePayment.Domain.Models;
using Microsoft.EntityFrameworkCore;
using System;
@@ -8,6 +9,7 @@
using Volo.Abp;
using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories;
using Z.EntityFramework.Plus;
using ZeroD.Util;

namespace HumanResourcesServices.Application
@@ -16,21 +18,27 @@
    {
        private readonly IRepository<User, Guid> _userRepository;
        private readonly IRepository<Role, Guid> _roleRepository;
        private readonly IRepository<LifePayChannles, Guid> _channleRepository;
        private readonly IRepository<UserRole, Guid> _userRoleRep;
        private readonly IRepository<UserChannle, Guid> _userChannleRep;

        public UserRoleService(
               IRepository<User, Guid> userRepository,
               IRepository<Role, Guid> roleRepository,
               IRepository<UserRole, Guid> userRoleRep)
               IRepository<LifePayChannles, Guid> channleRepository,
               IRepository<UserRole, Guid> userRoleRep,
               IRepository<UserChannle, Guid> userChannleRep)
        {
            _userRepository = userRepository;
            _roleRepository = roleRepository;
            _channleRepository = channleRepository;
            _userRoleRep = userRoleRep;
            _userChannleRep = userChannleRep;
        }

        public async Task<PageOutput<UserDto>> GetBackClientUsers(GetBackClientUsersInput input)
        {
            var query = _userRepository.Where(s => s.ClientId == Constant.ClientType.Back).Include(i => i.UserRoles).Select(u => new UserDto
            var query = _userRepository.Where(s => s.ClientId == Constant.ClientType.Back).Include(i => i.UserRoles).Include(i => i.UserChannle).Select(u => new UserDto
            {
                Id = u.Id,
                UserName = u.UserName,
@@ -44,6 +52,13 @@
                            Id = r.Id,
                            Name = r.Name,
                        },
                Channles = from uc in u.UserChannle
                           from c in _channleRepository.Where(s => s.Id == uc.ChannleId)
                        select new UserChannleDto
                        {
                            Id = c.Id,
                            Name = c.ChannlesName,
                        },
                Remark = u.Remark,
                CompanyOrgId = u.CompanyOrgId,
                DepartmentOrgId = u.DepartmentOrgId
@@ -77,6 +92,21 @@
            entity.Remark = input.Remark;
            entity.DepartmentOrgId = input.DepartmentOrgId;
            entity.CompanyOrgId = input.CompanyOrgId;

            var userchannle = await _userChannleRep.Where(s => s.UserId == input.Id).DeleteAsync();
            List<UserChannle> userChannles = new List<UserChannle>();
            foreach (var item in input.ChannlesId)
            {
                userChannles.Add(new UserChannle()
                {
                    Id = Guid.NewGuid(),
                    ChannleId = item,
                    UserId = entity.Id
                });
            }

            await _userChannleRep.InsertManyAsync(userChannles);

            return Constant.SUCCESS;
        }


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

@@ -89,7 +89,6 @@
    ä¾›åº”商折扣价=40,
}


public enum LifePaySwitchTypeEnum
{
    H5 = 10,
@@ -112,3 +111,14 @@

    å¤–部渠道 = 20,
}
public enum IntroInfoTypeEnum
{
    [Description("文本")]
    æ–‡æœ¬ = 0,

    [Description("图片")]
    å›¾ç‰‡ = 1,

    [Description("视频")]
    è§†é¢‘ = 2
}

 LifePayment/LifePayment.Domain/Common/User.cs

@@ -10,9 +10,8 @@
    {
        public User()
        {

            UserRoles = new HashSet<UserRole>();

            UserChannle = new HashSet<UserChannle>();
        }

        /// <summary>
@@ -180,10 +179,8 @@
        /// </summary>
        public Guid? IndustrialParkId { get; set; }



        public ICollection<UserRole> UserRoles { get; set; }


        public ICollection<UserChannle> UserChannle { get; set; }
    }
}

 LifePayment/LifePayment.Domain/Common/UserChannle.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
using System;
using Volo.Abp.Domain.Entities;

namespace LifePayment.Domain.Models
{
    public class UserChannle : Entity<Guid>
    {
        /// <summary>
        /// ç”¨æˆ·Id
        /// </summary>
        public virtual Guid UserId { get; set; }

        /// <summary>
        /// æ¸ é“Id
        /// </summary>
        public virtual Guid ChannleId { get; set; }
        public virtual User User { get; set; }
    }
}

 LifePayment/LifePayment.Domain/LifePay/LifePayChannles.cs

@@ -17,6 +17,8 @@

    public decimal ChannlesRate { get; set; }

    public decimal ChannlesRakeRate { get; set; }

    public LifePaySwitchTypeEnum SwitchType { get; set; }

    public LifePayChannelsStatsEnum Status { get; set; }

 LifePayment/LifePayment.Domain/LifePay/LifePayIntroInfo.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
using LifePayment.Domain.Shared;
using System;
using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing;

namespace LifePayment.Domain.LifePay;

public partial class LifePayIntroInfo : FullAuditedEntity<Guid>, IDataUserFilter
{
    public LifePayIntroInfo()
    {
    }

    /// <summary>
    /// ç±»åž‹
    /// </summary>
    public IntroInfoTypeEnum Type { get; set; }

    /// <summary>
    /// ç”Ÿæ´»ç¼´è´¹ç±»åž‹
    /// </summary>
    public LifePayOrderTypeEnum LifePayType { get; set; }

    /// <summary>
    /// æ‘˜è¦
    /// </summary>
    public string ContentSummary { get; set; }

    /// <summary>
    /// æ–‡æœ¬å†…容
    /// </summary>
    public string Content { get; set; }

    /// <summary>
    /// å›¾ç‰‡/视频路径
    /// </summary>
    public string Path { get; set; }

    /// <summary>
    /// æŽ’序
    /// </summary>
    public int Sequence { get; set; }
}

 LifePayment/LifePayment.Domain/LifePay/LifePayPremium.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
using LifePayment.Domain.Shared;
using System;
using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing;

namespace LifePayment.Domain;

public partial class LifePayPremium : FullAuditedEntity<Guid>, IDataUserFilter
{
    public LifePayPremium()
    {
    }

    public LifePayTypeEnum PremiumType { get; set; }

    public decimal Rate { get; set; }
}

 LifePayment/LifePayment.Domain/LifePay/LifePayUser.cs

@@ -20,8 +20,18 @@
        /// </summary>
        public string OpenId { get; set; }

        /// <summary>
        /// æ³¨å†Œæ¸ é“编号
        /// </summary>
        public string CreationChannleNum { get; set; }

        public string UnionId { get; set; }

        public DateTime? LastLoginTime { get; set; }

        /// <summary>
        /// æœ€åŽç™»å½•æ¸ é“编号
        /// </summary>
        public string LastLoginChannleNum { get; set; }
    }
}

 LifePayment/LifePayment.EntityFrameworkCore/LifePaymentServicesDbContext.cs

@@ -1,4 +1,5 @@
using LifePayment.Domain;
using LifePayment.Domain.LifePay;
using LifePayment.Domain.Models;
using Microsoft.EntityFrameworkCore;
using Volo.Abp.Data;
@@ -22,15 +23,20 @@

        public virtual DbSet<LifePayRate> LifePayRate { get; set; }

        public virtual DbSet<LifePayPremium> LifePayPremium { get; set; }

        public virtual DbSet<Area> Area { get; set; }

        public virtual DbSet<User> Users { get; set; }

        public virtual DbSet<Role> Roles { get; set; }

        public virtual DbSet<LifePayIntroInfo> LifePayIntroInfo { get; set; }

        public virtual DbSet<UserRole> UserRoles { get; set; }

        public virtual DbSet<UserChannle> UserChannle { get; set; }

        public virtual DbSet<OperateHistory> OperateHistory { get; set; }

        public virtual DbSet<LifePayChannles> LifePayChannles { get; set; }

 LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml

@@ -98,6 +98,18 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetPremium">
            <summary>
            èŽ·å–手续费费率
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetIntroInfo(LifePayment.Domain.Shared.LifePayOrderTypeEnum)">
            <summary>
            èŽ·å–须知
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetUserPage(ZeroD.Util.PageInput)">
            <summary>
            èŽ·å–用户分页数据
@@ -140,6 +152,11 @@
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayChannlesAllList">
            <summary>
            èŽ·å–全部缴费渠道
            </summary>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayChannlesDto(System.Guid)">
            <summary>
            èŽ·å–渠道详情
@@ -270,6 +287,20 @@
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.CreateEditLifePayPremium(System.Collections.Generic.List{LifePayment.Application.Contracts.LifePayPremiumInput})">
            <summary>
            æ‰‹ç»­è´¹è´¹çŽ‡é…ç½®
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.EditIntroInfo(LifePayment.Application.Contracts.LifePayIntroInfoInput)">
            <summary>
            é¡»çŸ¥é…ç½®
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.SetLifePayOrderPayType(LifePayment.Domain.Shared.SetLifePayOrderPayTypeInput)">
            <summary>
            è®¾ç½®ç”Ÿæ´»ç¼´è´¹æ”¯ä»˜ç±»åž‹

 LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml

@@ -101,12 +101,45 @@
            <param name="id"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.CreateEditLifePayRate(System.Collections.Generic.List{LifePayment.Application.Contracts.LifePayRateInput})">
            <summary>
            ç¼–辑折扣
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.CreateEditLifePayPremium(System.Collections.Generic.List{LifePayment.Application.Contracts.LifePayPremiumInput})">
            <summary>
            ç¼–辑手续费费率
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.EditIntroInfo(LifePayment.Application.Contracts.LifePayIntroInfoInput)">
            <summary>
            é¡»çŸ¥é…ç½®
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.GetRate">
            <summary>
            èŽ·å–折扣
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.GetPremium">
            <summary>
            èŽ·å–手续费费率
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.GetIntroInfo(LifePayment.Domain.Shared.LifePayOrderTypeEnum)">
            <summary>
            èŽ·å–须知
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.GetUserLifePayOrderPage(LifePayment.Application.Contracts.QueryLifePayOrderListInput)">
            <summary>
            èŽ·å–我的订单分页数据
@@ -463,11 +496,86 @@
            å¤‡æ³¨
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoInput.LifePayType">
            <summary>
            ç”Ÿæ´»ç¼´è´¹ç±»åž‹
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoInput.Data">
            <summary>
            æ›´æ–°å†…容
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoDetail.Type">
            <summary>
            ç±»åž‹
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoDetail.ContentSummary">
            <summary>
            æ‘˜è¦
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoDetail.Content">
            <summary>
            æ–‡æœ¬å†…容
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoDetail.Path">
            <summary>
            å›¾ç‰‡/视频路径
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoDetail.Sequence">
            <summary>
            æŽ’序
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoOutput.Type">
            <summary>
            ç±»åž‹
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoOutput.LifePayType">
            <summary>
            ç”Ÿæ´»ç¼´è´¹ç±»åž‹
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoOutput.ContentSummary">
            <summary>
            æ‘˜è¦
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoOutput.Content">
            <summary>
            æ–‡æœ¬å†…容
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoOutput.Path">
            <summary>
            å›¾ç‰‡/视频路径
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayIntroInfoOutput.Sequence">
            <summary>
            æŽ’序
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserListOutput.PhoneNumber">
            <summary>
            ç”¨æˆ·æ‰‹æœºå·
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserListOutput.CreationChannle">
            <summary>
            æœ€åŽç™»å½•æ¸ é“
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserListOutput.LastLoginChannle">
            <summary>
            æœ€åŽç™»å½•æ¸ é“
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.PhoneNumber">
            <summary>
            ç”¨æˆ·æ‰‹æœºå·
@@ -1358,6 +1466,11 @@
            è§’色
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.CreateBackClientUserInput.ChannlesId">
            <summary>
            æ¸ é“列表
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.CreateBackClientUserInput.CompanyOrgId">
            <summary>
            ç»„织架构公司id
@@ -1443,6 +1556,11 @@
            è§’色信息
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserDto.Channles">
            <summary>
            è§’色信息
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserDto.Remark">
            <summary>
            å¤‡æ³¨
@@ -1518,6 +1636,16 @@
            å¤‡æ³¨
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserChannleDto.Id">
            <summary>
            æ¸ é“Id
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserChannleDto.Name">
            <summary>
            æ¸ é“名
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.GetRolesInput.QueryCondition">
            <summary>
            æŸ¥è¯¢æ¡ä»¶ï¼šè§’色名称

 LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs

@@ -63,6 +63,8 @@
                    orderNo = confirmElectricOrderResponse.ElectricChargeOrder.OutOrderNo;
                    acoolyOrderNo = confirmElectricOrderResponse.ElectricChargeOrder.BusiOrderNo;
                    _logger.LogError("ACOOLY回调通处理结果状态：" + confirmElectricOrderResponse.ElectricChargeOrder.Status);

                    /// TODO çŠ¶æ€ä¸æ­£ç¡®
                    if (!confirmElectricOrderResponse.Success
                    || (confirmElectricOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmElectricOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                    {

 LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs

@@ -136,6 +136,29 @@
        }

        /// <summary>
        /// èŽ·å–手续费费率
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [AllowAnonymous]
        public async Task<List<LifePayPremiumListOutput>> GetPremium()
        {
            return await _lifePayService.GetPremium();
        }

        /// <summary>
        /// èŽ·å–须知
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [AllowAnonymous]
        public async Task<List<LifePayIntroInfoOutput>> GetIntroInfo(LifePayOrderTypeEnum type)
        {
            return await _lifePayService.GetIntroInfo(type);
        }


        /// <summary>
        /// èŽ·å–用户分页数据
        /// </summary>
        /// <param name="input"></param>
@@ -208,6 +231,15 @@
        }

        /// <summary>
        /// èŽ·å–全部缴费渠道
        /// </summary>
        [HttpGet]
        public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
        {
            return await _lifePayService.GetLifePayChannlesAllList();
        }

        /// <summary>
        /// èŽ·å–渠道详情
        /// </summary>
        /// <param name="id"></param>
@@ -446,6 +478,30 @@
        }

        /// <summary>
        /// æ‰‹ç»­è´¹è´¹çŽ‡é…ç½®
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<int> CreateEditLifePayPremium(List<LifePayPremiumInput> input)
        {
            await _lifePayService.CreateEditLifePayPremium(input);
            return Constant.SUCCESS;
        }

        /// <summary>
        /// é¡»çŸ¥é…ç½®
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<int> EditIntroInfo(LifePayIntroInfoInput input)
        {
            await _lifePayService.EditIntroInfo(input);
            return Constant.SUCCESS;
        }

        /// <summary>
        /// è®¾ç½®ç”Ÿæ´»ç¼´è´¹æ”¯ä»˜ç±»åž‹
        /// </summary>
        /// <param name="input"></param>

 LifePayment/LifePayment.rar

Binary files differ