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 | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/cylsg/cylsg.Application/Users/UserAppService.cs b/cylsg/cylsg.Application/Users/UserAppService.cs
index 6e4b107..d7899ee 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;
}
@@ -63,8 +70,8 @@
{
userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);
}
-
-
+ //澧炲姞宸濆嵃鏉冮檺鑾峰彇
+ userDto.OAPermissions= await _OAServices.GetOAPermissions();
return userDto;
@@ -295,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