diff --git a/YLErpDAL/Modules/ApiModule/YLErpWebApiHelper.cs b/YLErpDAL/Modules/ApiModule/YLErpWebApiHelper.cs index 197c9285..d5a5dc29 100644 --- a/YLErpDAL/Modules/ApiModule/YLErpWebApiHelper.cs +++ b/YLErpDAL/Modules/ApiModule/YLErpWebApiHelper.cs @@ -13,7 +13,6 @@ namespace YLErp.Modules.ApiModule { public class YLErpWebApiHelper { - private string baseUrl; private Func tokenFunc; private HttpHelper httpHelper; public YLErpWebApiHelper(Func tokenFunc) diff --git a/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs b/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs index e2f7c1f4..b81e4219 100644 --- a/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs +++ b/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs @@ -6204,9 +6204,6 @@ namespace YLErp.Modules.RiskModule throw new ArgumentException($"“{nameof(tag_prefix)}”不能是 Null 或为空", nameof(tag_prefix)); } double? currentValue = null; - - currentValue = null; - double posiVal = 0; CheckQuotaMoitorModel current = positionList.FirstOrDefault(x => x.Current); var tag = $"{tag_prefix}({checkItem.quotaType})"; switch (checkItem.quotaType) @@ -6235,12 +6232,6 @@ namespace YLErp.Modules.RiskModule default: return null; } - checkItem.currentValue = Math.Round(currentValue ?? 0, 2); - if (!ValidateQuoteResult(checkItem)) - { - return checkItem; - } - return null; } private List checkUnderlying(List positionList, List posiList, string tag_prefix, QuotaSetting[] settings, List settingAll, bool warning) diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs index 9650d66d..aa586c41 100644 --- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs @@ -1741,13 +1741,6 @@ namespace YLErp.Modules.SwapModule decimal closeFee = 0;//当日平仓费用 decimal closeMtmPnl = 0;//当日平仓盈亏 var posiType = fposition == null ? 0 : fposition.PositionType; - var swapInsertEnum = SwapPushDataEnum.收益互换交易新增; - var swapPosiEnum = SwapPushDataEnum.互换资产交易新增; - if (fposition != null) - { - swapInsertEnum = SwapPushDataEnum.收益互换交易修改; - swapPosiEnum = SwapPushDataEnum.互换资产交易修改; - } eventList.ForEach(x => { x.EventId = swapEvent.id; diff --git a/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs b/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs index 536504ed..799b9915 100644 --- a/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs +++ b/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs @@ -403,13 +403,7 @@ namespace YLErp.Modules.TradeModule.DealModule } var swap_event= swapEventService.UpdateSwapEvent(); swapEventService.AddSwapEventDate(openDate.Value, td.id, (int)SwapEventTypeEnum.确认交易, "", 0, true, history); - if (addlog) - { - var swapInsertEnum = SwapPushDataEnum.收益互换交易新增; - var posiInsertEnum = SwapPushDataEnum.互换资产交易新增; - var marginInsertEnum = SwapPushDataEnum.预付金交易新增; - } - else + if (!addlog) { Task.Run(() => {