Merge branch 'glms/feature/1.4.2' of http://git.yiliantech.com/gitlab/otc-dev/zszq-trs into glms/feature/1.4.2

YLErpDAL/Modules/SwapModule/SwapDealService.cs

@@ -788,13 +788,15 @@ namespace YLErp.Modules.SwapModule
 
                 }
                 flowEvent.InterestPrincipal = tdDynomicPrincipal * closePercent;
-                interest = flowEvent.InterestPrincipal * (flowEvent.InterestRate + Convert.ToDecimal(floatRate));
-                tdinterest = tdDynomicPrincipal * (flowEvent.InterestRate + Convert.ToDecimal(floatRate));
+                var interest1 = flowEvent.InterestPrincipal * (flowEvent.InterestRate + Convert.ToDecimal(floatRate));
+                var tdinterest1 = tdDynomicPrincipal * (flowEvent.InterestRate + Convert.ToDecimal(floatRate));
                 if (position.IsAnnualized)
                 {
-                    interest /= annualDays;
-                    tdinterest /= annualDays;
+                    interest1 /= annualDays;
+                    tdinterest1 /= annualDays;
                 }
+                interest += interest1;
+                tdinterest = tdinterest1;
             }
             else
             {
@@ -806,7 +808,7 @@ namespace YLErp.Modules.SwapModule
                     interest1 /= annualDays;
                     tdinterest1 /= annualDays;
                 }
-                interest = interest1;
+                interest += interest1;
                 tdinterest = tdinterest1;
             }
             flowEvent.FloatRate = Convert.ToDecimal(floatRate);

YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs

@@ -825,7 +825,8 @@ namespace YLErp.Modules.SwapModule
             positions.Add(position);
             List<eod_swap_position> preEodPositions = new List<eod_swap_position>();
             preEodPositions.Add(eodPayPosition);
-            if (position.InterestMode == (int)InterestModeEnum.固定值||position.InterestMode == (int)InterestModeEnum.初始预付金 || position.InterestMode == (int)InterestModeEnum.追加预付金)
+            var interestModes = new List<int>() { (int)InterestModeEnum.固定值, (int)InterestModeEnum.初始预付金, (int)InterestModeEnum.追加预付金 };
+            if (interestModes.Contains(position.InterestMode))
             {
                 orginPv = eodPayPosition.InterestPrincipalFix;
             }
@@ -853,7 +854,7 @@ namespace YLErp.Modules.SwapModule
             newEodPayPosition.FloatRateUnderlyingCode = position.FloatRateUnderlyingCode;
             newEodPayPosition.InterestFeePending = 0;
             //利息端估值用信息
-            newEodPayPosition.TdInterestPrincipal = interests.Count > 0 ? interests.First().InterestPrincipal : 0;
+            eodPayPosition.TdInterestPrincipal = interestModes.Contains(position.InterestMode) ? eodPayPosition.InterestPrincipalFix : posiNotionalValue;
             newEodPayPosition.TdInterestRate = interval.Rate;
             //当日已实现
             //newEodPayPosition.TdInterestFee = 0;
@@ -920,7 +921,8 @@ namespace YLErp.Modules.SwapModule
                 newEodPayPosition = eodPayPosition.Clone();
                 newEodPayPosition.id = 0;
             }
-            if (position.InterestMode == (int)InterestModeEnum.固定值 || position.InterestMode == (int)InterestModeEnum.初始预付金 || position.InterestMode == (int)InterestModeEnum.追加预付金)
+            var interestModes = new List<int>() { (int)InterestModeEnum.固定值, (int)InterestModeEnum.初始预付金, (int)InterestModeEnum.追加预付金 };
+            if (interestModes.Contains(position.InterestMode))
             {
                 orginPv = eodPayPosition.InterestPrincipalFix;
             }
@@ -962,8 +964,7 @@ namespace YLErp.Modules.SwapModule
             newEodPayPosition.interest_rest_days = position.interest_rest_days;
             newEodPayPosition.interest_rule = position.interest_rule;
             //利息端估值用信息
-            newEodPayPosition.TdInterestPrincipal = interests.Count > 0 ? interests.First().InterestPrincipal : 0;
-            newEodPayPosition.TdInterestPrincipal *= (1 - closePercent);
+            newEodPayPosition.TdInterestPrincipal = interestModes.Contains(position.InterestMode) ? eodPayPosition.InterestPrincipalFix : posiLongNotional + posiShortNational;
             if (interval != null)
             {
                 newEodPayPosition.TdInterestRate = interval.Rate;
@@ -1027,6 +1028,7 @@ namespace YLErp.Modules.SwapModule
             Log.Info($"eodPayPosition is {JsonHelper.Serialize(eodPayPosition, false)},newEodPayPosition is {JsonHelper.Serialize(newEodPayPosition, false)}");
             List<IntervalModel> intervals = position.SwapIntervalList;
             var tradeExtend = td.trade_extend.ExtendObj;
+            var interestModes = new List<int>() { (int)InterestModeEnum.固定值, (int)InterestModeEnum.初始预付金, (int)InterestModeEnum.追加预付金 };
             if (eodPayPosition == null)
             {
                 //if (position.PosiStartDate > valueDate)
@@ -1038,11 +1040,12 @@ namespace YLErp.Modules.SwapModule
                 eodPayPosition.ClientId = td.ClientId;
                 eodPayPosition.SwapTradeId = td.id;
                 //eodPayPosition.PositionId = position.id; 为了算利息时找不到给日期重新赋值
+               
                 eodPayPosition.InterestMode = position.InterestMode;
                 eodPayPosition.InterestPrincipalFix = position.InterestPrincipalFix;
                 eodPayPosition.InterestRateDefault = position.InterestRateDefault;
                 eodPayPosition.InterestSwapInterval = position.InterestSwapInterval;
-                eodPayPosition.TdInterestPrincipal = position.InterestMode == 1 ? eodPayPosition.InterestPrincipalFix : posiLongNational + posiShortNational;
+                eodPayPosition.TdInterestPrincipal = interestModes.Contains(position.InterestMode) ? eodPayPosition.InterestPrincipalFix : posiLongNational + posiShortNational;
                 eodPayPosition.PosiStartDate = td.StartDate.Value;
                 eodPayPosition.PosiMatuirityDate = td.ExerciseDate.Value;
                 eodPayPosition.IsAnnualized = position.IsAnnualized;
@@ -1060,7 +1063,7 @@ namespace YLErp.Modules.SwapModule
                 newEodPayPosition.id = 0;
                 newEodPayPosition.PositionId = position.id;
             }
-            if (position.InterestMode == (int)InterestModeEnum.固定值 || position.InterestMode == (int)InterestModeEnum.初始预付金 || position.InterestMode == (int)InterestModeEnum.追加预付金)
+            if (interestModes.Contains(position.InterestMode))
             {
                 orginPv = eodPayPosition.InterestPrincipalFix;
             }

YLErpDAL/Modules/SwapModule/SwapTradeBaseService.cs

@@ -397,10 +397,11 @@ namespace YLErp.Modules.SwapModule
                     
                     // 删除预付金腿的资金记录（通过交易ID、日期和Action类型查找，一次性查询避免MySQL连接重用问题）
                     var swapTradeIds = swapEvents.Select(s => s.SwapTradeId).Distinct().ToList();
+                    var actions = new List<string>() { ClientCashInCashOut.系统操作_预付金返息, ClientCashInCashOut.系统操作_互换 };
                     var premiumCashRecords = DbContext.ClientCashInCashOut
                         .Where(x => swapTradeIds.Contains(x.TradeId ?? 0)
                                  && x.HappenDate>=valueDate
-                                 && x.Action == ClientCashInCashOut.系统操作_预付金返息)
+                                 && actions.Contains(x.Action))
                         .ToList();
                     if (premiumCashRecords.Any())
                     {

YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js

@@ -623,13 +623,14 @@ const vue = new Vue({
                 }
                 var obdate = {};
                 if (type == 1) {
-                    var SettlementDate = value.Date;
+                    var settlementDate = value.Date;
                     if (value.SettlementDate!=null) {
-                        SettlementDate = value.SettlementDate;
+                        settlementDate = value.SettlementDate;
                     }
+                    var m = new moment(settlementDate);
                     obdate = {
                         date: _date,
-                        SettlementDate: _date,
+                        SettlementDate: m.format("YYYY-MM-DD"),
                         floatRateCode: floatRateCode,
                         val: _.toString(val) ? parseFloat(consNumberFormat.umpriceP(val)) : "",
                         itemChecked: itemChecked,