From a622695a0cd6ea5aa63869f5c1a891e589909f48 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期二, 07 四月 2026 16:14:57 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/Users/UserAppService.cs | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/cylsg/cylsg.Application/Users/UserAppService.cs b/cylsg/cylsg.Application/Users/UserAppService.cs
index 6906aaf..aea49ae 100644
--- a/cylsg/cylsg.Application/Users/UserAppService.cs
+++ b/cylsg/cylsg.Application/Users/UserAppService.cs
@@ -74,26 +74,20 @@
}
}
userDto.userWorker.IsLingHuoYongGong = IsGuDing;
- userDto.userWorker.Balance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0);
+ decimal ab = (userDto.userWorker.TiXianZonge ?? 0) - (userDto.userWorker.YiTiXianJine ?? 0 );
+ userDto.userWorker.Balance =ab < 0 ? 0 : ab;
if (IsGuDing)
{
- userDto.userWorker.AvailableBalance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine - 300 < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0 - 300);
+
+ userDto.userWorker.AvailableBalance = (ab-300)<0 ? 0 : (ab - 300);
}
else
userDto.userWorker.AvailableBalance = userDto.userWorker.Balance;
- 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);
if (userCompany != null)
@@ -343,10 +337,13 @@
}
}
userDto.userWorker.IsLingHuoYongGong = IsGuDing;
- userDto.userWorker.Balance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0);
+
+ decimal ab = (userDto.userWorker.TiXianZonge ?? 0) - (userDto.userWorker.YiTiXianJine ?? 0);
+ userDto.userWorker.Balance = ab < 0 ? 0 : ab;
if (IsGuDing)
{
- userDto.userWorker.AvailableBalance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine - 300 < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0 - 300);
+
+ userDto.userWorker.AvailableBalance = (ab - 300) < 0 ? 0 : (ab - 300);
}
else
@@ -356,7 +353,7 @@
- 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