小飞侠
9 天以前 2ff9e22aa01202003c8ba2b3d7c91226e61de1f8
cylsg/cylsg.Application/Users/UserAppService.cs
@@ -73,27 +73,25 @@
                    IsGuDing = true;
                }
            }
            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)
            if (userDto.userWorker != null)
                userDto.userWorker.IsLingHuoYongGong = IsGuDing;
            decimal ab = (userDto.userWorker?.TiXianZonge ?? 0) - (userDto.userWorker?.YiTiXianJine ?? 0);
            if (userDto.userWorker != null)
            {
                userDto.userWorker.AvailableBalance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine - 300 < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0 - 300);
                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;
            }
            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)
@@ -342,21 +340,28 @@
                    IsGuDing = true;
                }
            }
            if(userDto.userWorker != null)
            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)
            decimal ab = (userDto.userWorker?.TiXianZonge ?? 0) - (userDto.userWorker?.YiTiXianJine ?? 0);
            if (userDto.userWorker != null)
            {
                userDto.userWorker.AvailableBalance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine - 300 < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0 - 300);
                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;
            }
            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);