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

zhengyuxuan

2025-03-19 5f1c741dc7ecfc26d256b2413cdf54e7c39f47e2

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

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

@@ -202,6 +202,8 @@
    /// <returns></returns>
    Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input);

    Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList();

    Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id);



 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -352,19 +352,12 @@

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

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

    public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
@@ -1583,6 +1576,20 @@
        return result;
    }

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

    #endregion
}
        #endregion
    }

 LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYInput.cs

@@ -247,6 +247,11 @@
{
    public string CheckChannelId { get; set; }
}

public class LogErrorInput
{
    public string Error { get; set; }
}
public class SetLifePayOrderPayTypeInput : ChannelsBaseInput
{
    [Required(ErrorMessage = "订单号不可为空")]

 LifePayment/LifePayment.Domain/Common/CommonManager.cs

@@ -1,22 +1,11 @@
using LifePayment.Domain.Models;
using LifePayment.Domain.Shared;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration;
using System;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Domain.Repositories;
using ZeroD.Util;
using System.Text.Json.Serialization;
using System.Text.Json;
using Aliyun.OSS.Util;
using Aliyun.OSS;
using Nest;
using System.IO;

namespace LifePayment.Domain
{

 LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml

@@ -86,6 +86,12 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.AddLogger(LifePayment.Domain.Shared.LogErrorInput)">
            <summary>
            添加日志
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetRate">
            <summary>
            获取折扣
@@ -146,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>
            获取渠道详情

 LifePayment/LifePayment.Host/LifePaymentServiceHostModule.cs

@@ -150,6 +150,7 @@
                cacheOptions.GlobalCacheEntryOptions.SlidingExpiration = TimeSpan.FromMinutes(20);
            });
            this.Configure<ACOOLYOption>(configuration.GetSection("ACOOLY"));
            this.Configure<Config>("AliPayEcsign", configuration.GetSection("AliPayEcsign"));
            this.Configure<InformationOption>(configuration.GetSection("WeiXinCgi"));
        }


 LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs

@@ -2,6 +2,7 @@
using LifePayment.Domain.Shared;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -20,13 +21,16 @@
    {
        private readonly ILifePayService _lifePayService;
        private readonly IWebClientInfoProvider _webClientInfoProvider;
        private readonly ILogger<LifePayController> _logger;
        public LifePayController(
              ILifePayService lifePayService,
              IWebClientInfoProvider webClientInfoProvider
            , ILogger<LifePayController> logger
              )
        {
            _lifePayService = lifePayService;
            _webClientInfoProvider = webClientInfoProvider;
            _logger = logger;
        }

        #region 查询
@@ -105,6 +109,20 @@
        {
            return await _lifePayService.GetGasOrgType();
        }

        /// <summary>
        /// 添加日志
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [AllowAnonymous]

        public async Task<int> AddLogger(LogErrorInput input)
        {
            Logger.LogError("前端错误：" + input.Error);
            return Constant.SUCCESS;
        }


        /// <summary>
        /// 获取折扣
@@ -213,6 +231,15 @@
        }

        /// <summary>
        /// 获取全部缴费渠道
        /// </summary>
        [HttpGet]
        public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
        {
            return await _lifePayService.GetLifePayChannlesAllList();
        }

        /// <summary>
        /// 获取渠道详情
        /// </summary>
        /// <param name="id"></param>