From 3ddd2f6bbf6757a35f935e386fa43552a9560487 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期二, 07 四月 2026 14:23:35 +0800
Subject: [PATCH] 修改灵活用功

---
 cylsg/cylsg.Application/Users/UserAppService.cs  |   25 ++++++++++++++++++++++++-
 cylsg/cylsg.Application/Users/Dtos/UserDto.cs    |   17 +++++++++++++++++
 cylsg/cylsg.Application/Transfer/UserTransfer.cs |    1 +
 3 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/cylsg/cylsg.Application/Transfer/UserTransfer.cs b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
index d50535a..2942446 100644
--- a/cylsg/cylsg.Application/Transfer/UserTransfer.cs
+++ b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
@@ -598,6 +598,7 @@
         [ApiExplorerSettings(IgnoreApi = true)]
         public async Task<WeChatTransferOrder> CreateTransferOder(CreatTransferOderIN Param)
         {
+
             if(Param.Key!= DateTime.Now.ToString("yyyy-MM-dd:HH")+"CreatTransfer")
             {
                 //key 閿欒
diff --git a/cylsg/cylsg.Application/Users/Dtos/UserDto.cs b/cylsg/cylsg.Application/Users/Dtos/UserDto.cs
index 6f84b9e..aec685e 100644
--- a/cylsg/cylsg.Application/Users/Dtos/UserDto.cs
+++ b/cylsg/cylsg.Application/Users/Dtos/UserDto.cs
@@ -111,7 +111,22 @@
         /// </summary>
         public string Resume { get; set; }
 
+        /// <summary>
+        /// 鏄惁鏄伒娲荤敤宸�
+        /// </summary>
+        public bool  IsLingHuoYongGong { get; set; }
 
+      
+        /// <summary>
+        /// 鍙敤浣欓
+        /// </summary>
+        public decimal AvailableBalance { get; set; }
+
+        /// <summary>
+        /// 浣欓
+        /// </summary>
+        public decimal Balance { get; set; }
+        
         /// <summary>
         /// 鎻愮幇鎬婚
         /// </summary>
@@ -122,6 +137,8 @@
         /// 宸叉彁鐜伴噾棰�
         /// </summary>
         public decimal? YiTiXianJine { get; set; }
+
+        
     }
 
     public class UserCompanyDto
diff --git a/cylsg/cylsg.Application/Users/UserAppService.cs b/cylsg/cylsg.Application/Users/UserAppService.cs
index 8582f0f..d7899ee 100644
--- a/cylsg/cylsg.Application/Users/UserAppService.cs
+++ b/cylsg/cylsg.Application/Users/UserAppService.cs
@@ -11,6 +11,7 @@
 using System.Runtime.Intrinsics.Arm;
 using MapsterMapper;
 using ECTESTOA;
+using cylsg.Model.OrderModel;
 
 
 namespace cylsg.Application.Users
@@ -301,9 +302,31 @@
             {
                 userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker);
             }
+            bool IsGuDing = false;
+            var bdct = new BaseRepository<OrderBidding>();
+            if (bdct == null)
+            {
+                var userBd = await bdct.GetFirstAsync(x => x.WorkerUserId == userid);
+                if (userBd != null)
+                {
+                    IsGuDing = userBd.IsGuding ?? false;
+                }
+            }
+            userDto.userWorker.IsLingHuoYongGong = IsGuDing;
+            userDto.userWorker.Balance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0);
+            if (IsGuDing)
+            {
+                userDto.userWorker.AvailableBalance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine - 300 < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0 - 300);
+
+            }
+            else
+
+                userDto.userWorker.AvailableBalance = userDto.userWorker.Balance;
 
 
-            var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);
+
+
+              var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);
             if (userCompany != null)
             {
                 userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);

--
Gitblit v1.9.1