From 3e6b46d6c0c618c67868ea35bde79aa0a53be90b Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 09:43:31 +0800
Subject: [PATCH] fix:新增须知接口
---
LifePayment/LifePayment.Domain/LifePay/LifePayIntroInfo.cs | 43 +++++
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 93 +++++++++++
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 98 ++++++++++++
LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs | 2
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 47 +++++
LifePayment/LifePayment.Domain/LifePay/LifePayPremium.cs | 17 ++
LifePayment/LifePayment.EntityFrameworkCore/LifePaymentServicesDbContext.cs | 4
LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs | 31 +++
LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs | 12 +
LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml | 26 +++
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 84 ++++++++++
11 files changed, 454 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
index 93d2726..d7e405e 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
@@ -113,7 +113,26 @@
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>
/// 鑾峰彇鎶樻墸
@@ -122,6 +141,18 @@
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>
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 2a06944..2a2181f 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1,5 +1,6 @@
锘縰sing 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
{
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 5338c44..2ea55a1 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/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;
@@ -133,6 +140,27 @@
public async Task<List<LifePayRateListOutput>> GetRate()
{
return await _lifePayRateRepository.Where(x => x.IsDeleted == false).Select(x => new LifePayRateListOutput() { Id = x.Id, Rate = x.Rate, RateType = x.RateType })
+ .ToListAsync();
+ }
+
+ /// <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();
}
@@ -1219,6 +1247,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 +1277,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 绉佹湁
diff --git a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
index c0bcca7..5f4a93e 100644
--- a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
+++ b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
@@ -89,7 +89,6 @@
渚涘簲鍟嗘姌鎵ｄ环=40,
}
-
public enum LifePaySwitchTypeEnum
{
H5 = 10,
@@ -111,4 +110,15 @@
鍐呴儴娓犻亾 = 10,
澶栭儴娓犻亾 = 20,
+}
+public enum IntroInfoTypeEnum
+{
+ [Description("鏂囨湰")]
+ 鏂囨湰 = 0,
+
+ [Description("鍥剧墖")]
+ 鍥剧墖 = 1,
+
+ [Description("瑙嗛")]
+ 瑙嗛 = 2
}
\ No newline at end of file
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayIntroInfo.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayIntroInfo.cs
new file mode 100644
index 0000000..d4411e5
--- /dev/null
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayIntroInfo.cs
@@ -0,0 +1,43 @@
+锘縰sing 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; }
+}
\ No newline at end of file
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayPremium.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayPremium.cs
new file mode 100644
index 0000000..1e74747
--- /dev/null
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayPremium.cs
@@ -0,0 +1,17 @@
+锘縰sing 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; }
+}
\ No newline at end of file
diff --git a/LifePayment/LifePayment.EntityFrameworkCore/LifePaymentServicesDbContext.cs b/LifePayment/LifePayment.EntityFrameworkCore/LifePaymentServicesDbContext.cs
index 15260dc..e021985 100644
--- a/LifePayment/LifePayment.EntityFrameworkCore/LifePaymentServicesDbContext.cs
+++ b/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,12 +23,15 @@
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; }
diff --git a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
index 882aa48..858837f 100644
--- a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -92,6 +92,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>
鑾峰彇鐢ㄦ埛鍒嗛〉鏁版嵁
@@ -264,6 +276,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>
璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index 5ce8457..b32b266 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -101,9 +101,42 @@
<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>
@@ -463,6 +496,71 @@
澶囨敞
</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>
鐢ㄦ埛鎵嬫満鍙�
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index 3c685ec..8e0e2b9 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/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))
{
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index 90d9887..58b03bb 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -118,6 +118,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>
@@ -428,6 +451,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>
--
Gitblit v1.9.1