From c682cd59ded8e71957a802dd4f8dcf58e0113c0f Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 11 九月 2025 15:33:30 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Models/UserServer/ElectronSigns/Queries/GetEnabledElectronSignSettingsQuery.cs | 10 ++++++++++
FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletExpandindirectCommandHandler.cs | 14 ++++++++++++--
FlexJobApi.UserServer.Application/ElectronSign/Queries/ElectronSignSettingQueryHandler.cs | 7 +++++--
FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml | 2 +-
FlexJobApi.Database.Migrations/Migrations/20250911030650_UpdateUserAuth0911002.cs | 10 +++++-----
5 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/FlexJobApi.Core/Models/UserServer/ElectronSigns/Queries/GetEnabledElectronSignSettingsQuery.cs b/FlexJobApi.Core/Models/UserServer/ElectronSigns/Queries/GetEnabledElectronSignSettingsQuery.cs
index 9f702c3..6fe4056 100644
--- a/FlexJobApi.Core/Models/UserServer/ElectronSigns/Queries/GetEnabledElectronSignSettingsQuery.cs
+++ b/FlexJobApi.Core/Models/UserServer/ElectronSigns/Queries/GetEnabledElectronSignSettingsQuery.cs
@@ -17,6 +17,11 @@
/// 浼佷笟Id
/// </summary>
public Guid? EnterpriseId { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏌ヨ鍏ㄩ儴
+ /// </summary>
+ public bool? All { get; set; }
}
/// <summary>
@@ -30,6 +35,11 @@
public EnumElectronSignAccess Access { get; set; }
/// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool IsDisabled { get; set; }
+
+ /// <summary>
/// 瀹炲悕璐圭敤
/// </summary>
public decimal? RealVerifyCost { get; set; }
diff --git a/FlexJobApi.Database.Migrations/Migrations/20250911030650_UpdateUserAuth0911002.cs b/FlexJobApi.Database.Migrations/Migrations/20250911030650_UpdateUserAuth0911002.cs
index aacc944..42a0364 100644
--- a/FlexJobApi.Database.Migrations/Migrations/20250911030650_UpdateUserAuth0911002.cs
+++ b/FlexJobApi.Database.Migrations/Migrations/20250911030650_UpdateUserAuth0911002.cs
@@ -12,11 +12,11 @@
{
migrationBuilder.Sql(@"
UPDATE [User] SET RealMethod = (
- SELECT
- CASE FaceRealUrl
- WHEN NULL THEN (
- CASE BankCard
- WHEN NULL THEN 10
+ SELECT
+ CASE
+ WHEN FaceRealUrl IS NULL THEN (
+ CASE
+ WHEN BankCard IS NULL THEN 10
ELSE 20
END
)
diff --git a/FlexJobApi.UserServer.Application/ElectronSign/Queries/ElectronSignSettingQueryHandler.cs b/FlexJobApi.UserServer.Application/ElectronSign/Queries/ElectronSignSettingQueryHandler.cs
index 87c4211..5d220bf 100644
--- a/FlexJobApi.UserServer.Application/ElectronSign/Queries/ElectronSignSettingQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/ElectronSign/Queries/ElectronSignSettingQueryHandler.cs
@@ -32,8 +32,11 @@
public async Task<List<GetEnabledElectronSignSettingsQueryResultItem>> Handle(GetEnabledElectronSignSettingsQuery request, CancellationToken cancellationToken)
{
var logier = JwtUtils.GetCurrentLogier();
- var q = rep.AsQueryable().AsNoTracking()
- .Where(it => !it.IsDisabled);
+ var q = rep.AsQueryable().AsNoTracking();
+ if (request.All != true)
+ {
+ q = q.Where(it => !it.IsDisabled);
+ }
if (logier.Type == EnumUserType.Enterprise)
{
request.EnterpriseId = logier.EnterpriseId;
diff --git a/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletExpandindirectCommandHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletExpandindirectCommandHandler.cs
index 288d783..c48392a 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletExpandindirectCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletExpandindirectCommandHandler.cs
@@ -23,7 +23,8 @@
public class EnterpriseWalletExpandindirectCommandHandler(
AlipayUtils alipayUtils,
IHttpRemoteService httpRemoteService,
- IRepository<EnterpriseWalletExpandindirectOrder> rep
+ IRepository<EnterpriseWalletExpandindirectOrder> rep,
+ IRepository<EnterpriseWallet> repEnterpriseWallet
) :
IRequestHandler<EnterpriseWalletExpandindirectCreateCommand, Guid>,
IRequestHandler<EnterpriseWalletExpandindirectOrderCancelCommand, Guid>,
@@ -32,6 +33,7 @@
private readonly AlipayUtils alipayUtils = alipayUtils;
private readonly IHttpRemoteService httpRemoteService = httpRemoteService;
private readonly IRepository<EnterpriseWalletExpandindirectOrder> rep = rep;
+ private readonly IRepository<EnterpriseWallet> repEnterpriseWallet = repEnterpriseWallet;
/// <summary>
/// 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠ｈ繘浠�
@@ -48,11 +50,19 @@
request.EnterpriseId = logier.EnterpriseId;
}
if (request.EnterpriseId == null) throw Oops.Oh(EnumErrorCodeType.s400, "璇峰～鍐欎紒涓欼d");
+ var wallet = await repEnterpriseWallet.AsQueryable().AsNoTracking()
+ .Where(it => it.EnterpriseId == request.EnterpriseId)
+ .FirstOrDefaultAsync();
+ if (wallet == null)
+ {
+ throw Oops.Oh(EnumErrorCodeType.s404, "浼佷笟閽卞寘");
+ }
var source = await rep.AsQueryable()
.OrderByDescending(it => it.CreatedTime)
- .Where(it => it.Wallet.EnterpriseId == request.EnterpriseId && it.OrderId != null && it.OrderId != "")
+ .Where(it => it.WalletId == wallet.Id && it.OrderId != null && it.OrderId != "")
.FirstOrDefaultAsync();
var entity = new EnterpriseWalletExpandindirectOrder();
+ entity.WalletId = wallet.Id;
if (source != null)
{
if (source.OrderStatus == EnumEnterpriseWalletExpandindirectOrderStatus.PROCESSING)
diff --git a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
index d11ee0d..7278d9d 100644
--- a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
+++ b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
@@ -612,7 +612,7 @@
鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠ｈ繘浠�
</summary>
</member>
- <member name="M:FlexJobApi.UserServer.Application.EnterpriseWalletExpandindirectCommandHandler.#ctor(FlexJobApi.Core.AlipayUtils,Furion.HttpRemote.IHttpRemoteService,Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseWalletExpandindirectOrder})">
+ <member name="M:FlexJobApi.UserServer.Application.EnterpriseWalletExpandindirectCommandHandler.#ctor(FlexJobApi.Core.AlipayUtils,Furion.HttpRemote.IHttpRemoteService,Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseWalletExpandindirectOrder},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseWallet})">
<summary>
鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠ｈ繘浠�
</summary>
--
Gitblit v1.9.1