From 82831a86d529817e51f5b6e3cec636d21cef3c9b Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 16:17:40 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 124 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 120 insertions(+), 4 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 37a1beb..d0c1245 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -25,9 +25,12 @@
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;
+using System.Linq.Dynamic.Core;
+using static Volo.Abp.Identity.Settings.IdentitySettingNames;
namespace LifePayment.Application;
@@ -37,8 +40,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 +60,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 +74,8 @@
_lifePayRateRepository = lifePayRateRepository;
_lifePayOrderRepository = lifePayOrderRepository;
_lifePayUserRepository = lifePayUserRepository;
+ _lifePayPremiumRepository = lifePayPremiumRepository;
+ _lifePayIntroInfoRepository = lifePayIntroInfoRepository;
_aliPayApi = aliPayApi;
_wxPayApi = wxPayApi;
_wxPayOptions = wxPayOptions.Value;
@@ -137,17 +146,44 @@
}
/// <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)
+ public async Task<PageOutput<UserListOutput>> GetUserPage(QueryUserPageInput input)
{
- return await _lifePayUserRepository.Select(x =>
+ return await _lifePayUserRepository.Where(x => x.IsDeleted == false)
+ .WhereIf(!string.IsNullOrEmpty(input.QueryCondition), x => x.PhoneNumber.Contains(input.QueryCondition) || x.Name.Contains(input.QueryCondition))
+ .WhereIf(input.CreationTime.HasValue, x => x.CreationTime.ToString("yyyy-MM-dd") == input.CreationTime.Value.ToString("yyyy-MM-dd"))
+ .Select(x =>
new UserListOutput()
{
Id = x.Id,
+ CreationChannle = string.IsNullOrEmpty(x.CreationChannleNum) ? "" : _lifePayChannlesRep.Where(c => c.ChannlesNum == x.CreationChannleNum).FirstOrDefault().ChannlesName,
+ LastLoginChannle = string.IsNullOrEmpty(x.LastLoginChannleNum) ? "" : _lifePayChannlesRep.Where(c => c.ChannlesNum == x.LastLoginChannleNum).FirstOrDefault().ChannlesName,
PhoneNumber = x.PhoneNumber,
+ Name = string.IsNullOrEmpty(x.Name) ? "" : x.Name,
CreationTime = x.CreationTime,
LastLoginTime = x.LastLoginTime
})
@@ -339,6 +375,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -354,6 +391,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -1039,6 +1077,15 @@
await _lifePayOrderRepository.UpdateAsync(order);
}
+ /// <summary>
+ /// 寰俊閫�娆�
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <param name="reason"></param>
+ /// <param name="refund"></param>
+ /// <param name="total"></param>
+ /// <param name="currency"></param>
+ /// <returns></returns>
public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string reason, int refund, int total, string currency = "CNY")
{
WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest
@@ -1059,8 +1106,13 @@
return res;
}
+
+
public async Task<int> AddUpdateUserAccount(AddUpdateUserAccountInput input)
{
+ var user = await _lifePayUserRepository.Where(r => r.Id == input.UserId && !r.IsDeleted).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(user == null, "鐢ㄦ埛涓嶅瓨鍦�");
+
if (input.Id.HasValue)
{
var userAccount = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.Id == input.Id)
@@ -1097,6 +1149,16 @@
};
await _lifePayAccount.InsertAsync(userAccount);
}
+
+ if (input.LifePayType == LifePayOrderTypeEnum.璇濊垂璁㈠崟)
+ {
+ var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);
+ if (!string.IsNullOrEmpty(extraProperties.Name))
+ {
+ user.Name = extraProperties.Name;
+ }
+ }
+
return Constant.SUCCESS;
}
@@ -1165,6 +1227,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;
@@ -1212,6 +1275,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");
@@ -1241,11 +1305,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 +1618,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
--
Gitblit v1.9.1