From 2ff9e22aa01202003c8ba2b3d7c91226e61de1f8 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期四, 09 四月 2026 09:03:07 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/Users/UserAppService.cs | 74 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/cylsg/cylsg.Application/Users/UserAppService.cs b/cylsg/cylsg.Application/Users/UserAppService.cs
index 6e4b107..74cf154 100644
--- a/cylsg/cylsg.Application/Users/UserAppService.cs
+++ b/cylsg/cylsg.Application/Users/UserAppService.cs
@@ -10,6 +10,9 @@
using System.Security.Claims;
using System.Runtime.Intrinsics.Arm;
using MapsterMapper;
+using ECTESTOA;
+using cylsg.Model.OrderModel;
+
namespace cylsg.Application.Users
{
@@ -22,11 +25,15 @@
private readonly ISystemService _systemService;
private ISqlSugarClient _sqlSugarClient;
private IMapper _mapper;
- public UserAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper)
+ private readonly IOAServices _OAServices;
+ public UserAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper
+ ,IOAServices oAServices
+ )
{
_systemService = systemService;
_sqlSugarClient = sqlSugarClient;
_mapper = mapper;
+ _OAServices = oAServices;
}
@@ -56,15 +63,43 @@
{
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&& x.IsGuding==true);
+ if (userBd != null)
+ {
+ IsGuDing = true;
+ }
+ }
+ if (userDto.userWorker != null)
+ userDto.userWorker.IsLingHuoYongGong = IsGuDing;
+
+ decimal ab = (userDto.userWorker?.TiXianZonge ?? 0) - (userDto.userWorker?.YiTiXianJine ?? 0);
+ if (userDto.userWorker != null)
+ {
+ userDto.userWorker.Balance = ab < 0 ? 0 : ab;
+ if (IsGuDing)
+ {
+
+ userDto.userWorker.AvailableBalance = (ab - 300) < 0 ? 0 : (ab - 300);
+
+ }
+ else
+
+ userDto.userWorker.AvailableBalance = userDto.userWorker?.Balance ?? 0;
+ }
+
+
+
var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);
if (userCompany != null)
{
userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);
}
-
-
+ //澧炲姞宸濆嵃鏉冮檺鑾峰彇
+ userDto.OAPermissions= await _OAServices.GetOAPermissions();
return userDto;
@@ -295,6 +330,35 @@
{
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 && x.IsGuding == true);
+ if (userBd != null)
+ {
+ IsGuDing = true;
+ }
+ }
+ if(userDto.userWorker != null)
+ userDto.userWorker.IsLingHuoYongGong = IsGuDing;
+
+ decimal ab = (userDto.userWorker?.TiXianZonge ?? 0) - (userDto.userWorker?.YiTiXianJine ?? 0);
+ if (userDto.userWorker != null)
+ {
+ userDto.userWorker.Balance = ab < 0 ? 0 : ab;
+ if (IsGuDing)
+ {
+
+ userDto.userWorker.AvailableBalance = (ab - 300) < 0 ? 0 : (ab - 300);
+
+ }
+ else
+
+ userDto.userWorker.AvailableBalance = userDto.userWorker?.Balance ?? 0;
+ }
+
+
var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);
--
Gitblit v1.9.1