From 28db30e5a458ee012959269d50e16eadaa0c5d12 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 05 九月 2025 15:10:09 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs | 3 ++-
FlexJobApi.Core/Entities/UserServer/Enterprises/EnterpriseWalletTransaction.cs | 10 ++++++++++
FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs | 6 ++++--
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/FlexJobApi.Core/Entities/UserServer/Enterprises/EnterpriseWalletTransaction.cs b/FlexJobApi.Core/Entities/UserServer/Enterprises/EnterpriseWalletTransaction.cs
index be94c50..5c56ca6 100644
--- a/FlexJobApi.Core/Entities/UserServer/Enterprises/EnterpriseWalletTransaction.cs
+++ b/FlexJobApi.Core/Entities/UserServer/Enterprises/EnterpriseWalletTransaction.cs
@@ -52,6 +52,16 @@
public decimal Balance { get; set; }
/// <summary>
+ /// 鏀舵浜哄鍚�
+ /// </summary>
+ public string ReceiveName { get; set; }
+
+ /// <summary>
+ /// 鏀舵璐︽埛
+ /// </summary>
+ public string ReceiveAccount { get; set; }
+
+ /// <summary>
/// 澶囨敞
/// </summary>
public string Remark { get; set; }
diff --git a/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs b/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
index c6098f1..30f2377 100644
--- a/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
+++ b/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
@@ -91,6 +91,8 @@
order.BizScene = "ENTRUST_TRANSFER";
order.TransactionStatus = EnumEnterpriseWalletTransactionStatus.WaitSubmit;
order.Balance = wallet.Balance;
+ order.ReceiveName = user.ReceiveName;
+ order.ReceiveAccount = user.ReceiveAccount;
await SetCode(order);
await repEnterpriseWalletTransaction.InsertNowAsync(order);
@@ -103,8 +105,8 @@
PayeeInfo = new Participant
{
IdentityType = "ALIPAY_LOGON_ID",
- Identity = user.ReceiveAccount,
- Name = user.ReceiveName,
+ Identity = order.ReceiveAccount,
+ Name = order.ReceiveName,
},
PayerInfo = new Participant
{
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
index c5a3dfb..7338a3a 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
@@ -158,7 +158,7 @@
public async Task<Guid> Handle(SureTaskSettlementOrderCommand request, CancellationToken cancellationToken)
{
var entity = await TaskInfoRepository.GetQueryable(rep, false)
- .Include(it => it.TaskInfoUsers)
+ .Include(it => it.TaskInfoUsers).ThenInclude(it => it.EnterpriseEmployee)
.Where(it => it.Id == request.TaskInfoId)
.FirstOrDefaultAsync();
if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "浠诲姟");
@@ -183,6 +183,7 @@
if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < (decimal)0.3) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}瀹炲彂閲戦涓嶅彲灏忎簬1鍏�");
user.Bank = model.Bank;
user.BankBranch = model.BankBranch;
+ user.ReceiveName = user.EnterpriseEmployee.Name;
user.ReceiveAccount = model.ReceiveAccount;
user.SettlementAmount = model.SettlementAmount;
user.ActualSettlementAmount = model.ActualSettlementAmount;
--
Gitblit v1.9.1