From 19863208cfdaf01735e75fbdafa33e426e735c04 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 12 九月 2025 15:09:41 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs | 33 ++++++++++------
FlexJobApi.Core/Jobs/RefreshEnterpriseWalletTransactionStatusJob.cs | 4 ++
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 8 ++--
FlexJobApi.Core/FlexJobApi.Core.xml | 32 +++++++++++++++
FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs | 6 ++
FlexJobApi.Core/Jobs/RefreshEnterpriseWalletStatusJob.cs | 4 ++
FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs | 4 ++
FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletCommandHandler.cs | 4 ++
8 files changed, 77 insertions(+), 18 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index 123c6fb..19c316d 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -4014,9 +4014,19 @@
鎵嬫満鍙�
</summary>
</member>
- <member name="F:FlexJobApi.Core.EnumValidationTypes.ValiIdentity">
+ <member name="F:FlexJobApi.Core.EnumValidationTypes.ValidIdentity">
<summary>
韬唤璇佸彿
+ </summary>
+ </member>
+ <member name="F:FlexJobApi.Core.EnumValidationTypes.ValidRealName">
+ <summary>
+ 濮撳悕
+ </summary>
+ </member>
+ <member name="F:FlexJobApi.Core.EnumValidationTypes.ValidVerifyCode">
+ <summary>
+ 楠岃瘉鐮�
</summary>
</member>
<member name="T:FlexJobApi.Core.EnumBillingMethod">
@@ -10397,6 +10407,26 @@
浼佷笟绛剧害鐘舵��
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetEnterpriseEmployeesQuery.SignContractStatus">
+ <summary>
+ 绛剧害鐘舵��
+ </summary>
+ </member>
+ <member name="F:FlexJobApi.Core.EnumGetEnterpriseEmployeesQuerySignContractStatus.UserWait">
+ <summary>
+ 鐏靛伐寰呯绾�
+ </summary>
+ </member>
+ <member name="F:FlexJobApi.Core.EnumGetEnterpriseEmployeesQuerySignContractStatus.EnterpriseWait">
+ <summary>
+ 浼佷笟寰呯绾�
+ </summary>
+ </member>
+ <member name="F:FlexJobApi.Core.EnumGetEnterpriseEmployeesQuerySignContractStatus.Pass">
+ <summary>
+ 宸茬绾�
+ </summary>
+ </member>
<member name="T:FlexJobApi.Core.GetEnterpriseEmployeesQueryResult">
<summary>
鏌ヨ鐏靛伐鍒嗛〉鍒楄〃鏁版嵁-缁撴灉
diff --git a/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs b/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
index 79ebd00..01e4698 100644
--- a/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
+++ b/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
@@ -307,6 +307,10 @@
AccountBookId = wallet.AccountBookId,
SceneCode = "SATF_FUND_BOOK",
MerchantUserId = wallet.Code,
+ ExtInfo = new
+ {
+ agreement_no = wallet.AgreementNo
+ }.ToJson()
});
if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
wallet.Balance = response.AvailableAmount.ToDecimal() ?? 0;
diff --git a/FlexJobApi.Core/Jobs/RefreshEnterpriseWalletStatusJob.cs b/FlexJobApi.Core/Jobs/RefreshEnterpriseWalletStatusJob.cs
index 7a2b393..542731f 100644
--- a/FlexJobApi.Core/Jobs/RefreshEnterpriseWalletStatusJob.cs
+++ b/FlexJobApi.Core/Jobs/RefreshEnterpriseWalletStatusJob.cs
@@ -104,6 +104,10 @@
AccountBookId = entity.AccountBookId,
SceneCode = "SATF_FUND_BOOK",
MerchantUserId = entity.Code,
+ ExtInfo = new
+ {
+ agreement_no = entity.AgreementNo
+ }.ToJson()
});
if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;
diff --git a/FlexJobApi.Core/Jobs/RefreshEnterpriseWalletTransactionStatusJob.cs b/FlexJobApi.Core/Jobs/RefreshEnterpriseWalletTransactionStatusJob.cs
index 4643544..8e80471 100644
--- a/FlexJobApi.Core/Jobs/RefreshEnterpriseWalletTransactionStatusJob.cs
+++ b/FlexJobApi.Core/Jobs/RefreshEnterpriseWalletTransactionStatusJob.cs
@@ -153,6 +153,10 @@
AccountBookId = wallet.AccountBookId,
SceneCode = "SATF_FUND_BOOK",
MerchantUserId = wallet.Code,
+ ExtInfo = new
+ {
+ agreement_no = wallet.AgreementNo
+ }.ToJson()
});
if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
wallet.Balance = response.AvailableAmount.ToDecimal() ?? 0;
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index 4c1cdff..9e4a3fe 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
@@ -255,10 +255,10 @@
{
errors.Add("鐏靛伐涓嶅瓨鍦�");
}
- else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed)
- {
- errors.Add("鏈畬鎴愰獙鏀�");
- }
+ //else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed)
+ //{
+ // errors.Add("鏈畬鎴愰獙鏀�");
+ //}
else if (item.Name != model.Name)
{
errors.Add("鐏靛伐濮撳悕涓庡疄鍚嶄俊鎭笉涓�鑷�");
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
index 3f4bfdd..c63d047 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
@@ -178,7 +178,7 @@
if (user == null) throw Oops.Oh(EnumErrorCodeType.s404, $"鐏靛伐{model.Name}");
if (user.SettlementStatus == EnumTaskSettlementStatus.InProcess) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}缁撶畻涓笉鍙慨鏀癸紝璇峰厛鎾ゅ洖");
if (user.SettlementStatus == EnumTaskSettlementStatus.Completed) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}宸茬粨绠椾笉鍙慨鏀�");
- if (user.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}鏈獙鏀�");
+ //if (user.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}鏈獙鏀�");
if (model.SettlementAmount < 0) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}缁撶畻閲戦涓嶅彲璐熸暟");
if (model.ActualSettlementAmount < 0) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}瀹炲彂閲戦涓嶅彲璐熸暟");
if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < 1) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}瀹炲彂閲戦涓嶅彲灏忎簬1鍏�");
@@ -269,6 +269,10 @@
AccountBookId = wallet.AccountBookId,
SceneCode = "SATF_FUND_BOOK",
MerchantUserId = wallet.Code,
+ ExtInfo = new
+ {
+ agreement_no = wallet.AgreementNo
+ }.ToJson()
});
if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
wallet.Balance = response.AvailableAmount.ToDecimal() ?? 0;
diff --git a/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletCommandHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletCommandHandler.cs
index b59fc51..260e6d6 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletCommandHandler.cs
@@ -192,6 +192,10 @@
AccountBookId = entity.AccountBookId,
SceneCode = "SATF_FUND_BOOK",
MerchantUserId = entity.Code,
+ ExtInfo = new
+ {
+ agreement_no = entity.AgreementNo
+ }.ToJson()
});
if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;
diff --git a/FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs
index a2e4c86..b9dd551 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs
@@ -154,18 +154,6 @@
}
}
- if (entity.AccountBookStatus == EnumEnterpriseWalletAccountBookStatus.Normal)
- {
- var response = alipayUtils.FundAccountbookQuery(new AlipayFundAccountbookQueryModel
- {
- AccountBookId = entity.AccountBookId,
- SceneCode = "SATF_FUND_BOOK",
- MerchantUserId = entity.Code,
- });
- if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
- entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;
- update = true;
- }
}
if (update)
@@ -217,6 +205,23 @@
else
{
model.ExpandindirectOrderStatus = EnumEnterpriseWalletExpandindirectOrderStatus.Wait;
+ }
+
+ if (entity.AccountBookStatus == EnumEnterpriseWalletAccountBookStatus.Normal)
+ {
+ var response = alipayUtils.FundAccountbookQuery(new AlipayFundAccountbookQueryModel
+ {
+ AccountBookId = entity.AccountBookId,
+ SceneCode = "SATF_FUND_BOOK",
+ MerchantUserId = entity.Code,
+ ExtInfo = new
+ {
+ agreement_no = entity.AgreementNo
+ }.ToJson()
+ });
+ if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
+ entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;
+ await rep.UpdateNowAsync(entity);
}
return model;
@@ -296,6 +301,10 @@
AccountBookId = entity.AccountBookId,
SceneCode = "SATF_FUND_BOOK",
MerchantUserId = entity.Code,
+ ExtInfo = new
+ {
+ agreement_no = entity.AgreementNo
+ }.ToJson()
});
if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;
--
Gitblit v1.9.1