Merge remote-tracking branch 'origin/glms/feature/1.4.2' into glms/feature/1.4.2-margin

YLErpDAL/Modules/ApiModule/YLErpWebApiHelper.cs

@@ -13,7 +13,6 @@ namespace YLErp.Modules.ApiModule
 {
     public class YLErpWebApiHelper
     {
-        private string baseUrl;
         private Func<string> tokenFunc;
         private HttpHelper httpHelper;
         public YLErpWebApiHelper(Func<string> tokenFunc) 

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<string> checkUnderlying(List<CheckQuotaMoitorModel> positionList, List<CheckQuotaMoitorModel> posiList, string tag_prefix, QuotaSetting[] settings, List<QuotaSetting> settingAll, bool warning)

YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs

@@ -1777,13 +1777,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;

YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs

@@ -418,13 +418,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(() =>
                 {