From dcc11e86bb7d063af1e6b7e9eccff3e292cbf6cb Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 17:03:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 88 +++++++++++++++++++++++++++-----------------
1 files changed, 54 insertions(+), 34 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index df3cda1..5ce58d1 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1,34 +1,25 @@
-锘縰sing DynamicQuery.Net.Dto.Input;
-using LifePayment.Application.Contracts;
+锘縰sing LifePayment.Application.Contracts;
using LifePayment.Domain;
+using LifePayment.Domain.LifePay;
using LifePayment.Domain.Models;
using LifePayment.Domain.Shared;
-using MailKit.Search;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
-using Nest;
using Newtonsoft.Json;
-using NPOI.OpenXmlFormats.Dml.Chart;
-using NPOI.SS.Formula.Functions;
-using StackExchange.Redis;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Security.Cryptography;
+using System.Linq.Dynamic.Core;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Entities;
+using Volo.Abp.Data;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.EventBus.Distributed;
-using ZeroD.Util;
-using ZeroD.Util.Fadd;
-using static LifePayment.Domain.Shared.LifePaymentConstant;
-using Volo.Abp.Data;
using Z.EntityFramework.Plus;
-using LifePayment.Domain.LifePay;
-using pingan.openbank.api.sdk.enums;
+using ZeroD.Util;
+using static LifePayment.Domain.Shared.LifePaymentConstant;
namespace LifePayment.Application;
@@ -45,7 +36,7 @@
private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
private readonly IDataFilter dataFilter;
-
+ private readonly IChannelFilter _channelFilter;
private readonly IAliPayApi _aliPayApi;
private readonly IWxPayApi _wxPayApi;
private readonly WxPayOption _wxPayOptions;
@@ -65,7 +56,8 @@
IOptions<WxPayOption> wxPayOptions,
IRepository<LifePayChannles, Guid> lifePayChannlesRep,
IRepository<LifePayAccount, Guid> lifePayAccount,
- IDataFilter dataFilter)
+ IDataFilter dataFilter,
+ IChannelFilter channelFilter)
{
_logger = logger;
_aCOOLYManager = aCOOLYManager;
@@ -81,6 +73,7 @@
_lifePayChannlesRep = lifePayChannlesRep;
_lifePayAccount = lifePayAccount;
this.dataFilter = dataFilter;
+ _channelFilter = channelFilter;
}
#region 鏌ヨ
@@ -160,7 +153,7 @@
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 })
+ .Select(x => new LifePayIntroInfoOutput() { Type = x.Type, ContentSummary = x.ContentSummary, Content = x.Content, LifePayType = x.LifePayType, Path = x.Path, Sequence = x.Sequence })
.ToListAsync();
}
@@ -169,16 +162,19 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<PageOutput<UserListOutput>> GetUserPage(PageInput input)
+ public async Task<PageOutput<UserListOutput>> GetUserPage(QueryUserPageInput input)
{
- var channel = await _lifePayChannlesRep.ToListAsync();
- return await _lifePayUserRepository.Select(x =>
+ return await _channelFilter.GetChannelLifePayUserFilter(_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) ? "" : channel.Where(c => c.ChannlesNum == x.CreationChannleNum).FirstOrDefault().ChannlesName,
- //LastLoginChannle = string.IsNullOrEmpty(x.LastLoginChannleNum) ? "" : channel.Where(c => c.ChannlesNum == x.LastLoginChannleNum).FirstOrDefault().ChannlesName,
+ 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
})
@@ -213,7 +209,6 @@
})
.GetPageResult(input.PageModel);
}
-
}
/// <summary>
@@ -223,7 +218,8 @@
/// <returns></returns>
public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input)
{
- var result = await (from a in _lifePayOrderRepository.Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
+
+ var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
@@ -234,7 +230,7 @@
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
.WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
- join b in _lifePayChannlesRep on a.ChannelId equals b.Id into temp
+ join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
from b in temp.DefaultIfEmpty()
select new LifePayOrderListOutput
{
@@ -276,7 +272,7 @@
return new PageOutput<UserLifePayOrderOutput>();
}
- return await _lifePayOrderRepository.Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
+ return await _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository).Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
@@ -398,7 +394,7 @@
public async Task<UserLifePayOrderRefundOutput> GetUserLifePayOrderRefund(Guid id)
{
- var order = await _lifePayOrderRepository.Where(x => x.Id == id).Select(x =>
+ var order = await _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository).Where(x => x.Id == id).Select(x =>
new UserLifePayOrderRefundOutput
{
Id = x.Id,
@@ -564,7 +560,7 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.Id
+ ChannelId = channle.ChannlesNum
};
await CreateLifePayOrder(orderInput);
@@ -608,7 +604,7 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.Id
+ ChannelId = channle.ChannlesNum
};
await CreateLifePayOrder(orderInput);
@@ -652,7 +648,7 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.Id
+ ChannelId = channle.ChannlesNum
};
await CreateLifePayOrder(orderInput);
@@ -1072,6 +1068,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
@@ -1092,8 +1097,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)
@@ -1130,6 +1140,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;
}
@@ -1553,7 +1573,7 @@
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
.WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
- join b in _lifePayChannlesRep on a.ChannelId equals b.Id into temp
+ join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
from b in temp.DefaultIfEmpty()
select new LifePayOrderListOutput
{
@@ -1598,5 +1618,5 @@
});
}
- #endregion
- }
+ #endregion
+}
--
Gitblit v1.9.1