Revert "feat(swap): 新增基础费率字段，支持百分比/单位数量模式切换及自动计算"

This reverts commit c9071a4eff.

YLErpDAL/Modules/SwapModule/SwapDealService.cs

@@ -291,11 +291,6 @@ namespace YLErp.Modules.SwapModule
                     floatEvent.UnderlyingInstrumentType = position.UnderlyingInstrumentType;
                     floatEvent.CloseFee = 0;
                     floatEvent.BeforeCloseFee = oriPosition.PosiTradingFeePending;
-                    //自动计算平仓交易费用
-                    floatEvent.TradingFee = CalcInitTradingFee(oriPosition, unwindData);
-                    //向前端传递单位交易费用和模式标记（NotMapped，不存库）
-                    floatEvent.PosiTradingFeeUnit = oriPosition.PosiTradingFeeUnit;
-                    floatEvent.PosiFeeType = oriPosition.PosiFeeType;
                     floatEvent.MarkClosePnl = 0;
                     floatEvent.PayDirection = position.PosiDirection;
                     floatEvent.PosiGrossPrice = position.PosiGrossPrice;
@@ -319,22 +314,6 @@ namespace YLErp.Modules.SwapModule
             return unwindData;
         }
         /// <summary>
-        /// 计算初始平仓交易费用
-        /// </summary>
-        private decimal CalcInitTradingFee(swap_position oriPosition, UnwindData unwindData)
-        {
-            if (oriPosition.PosiFeeType == 0)
-            {
-                //百分比模式：费率%/100 × 平仓名义本金
-                return Math.Round(oriPosition.PosiTradingFeeUnit / 100m * (decimal)unwindData.CloseNotionalValue, 2, MidpointRounding.AwayFromZero);
-            }
-            else
-            {
-                //单位数量模式：单位费率 × 平仓数量
-                return Math.Round(oriPosition.PosiTradingFeeUnit * (decimal)unwindData.CloseQty, 2, MidpointRounding.AwayFromZero);
-            }
-        }
-        /// <summary>
         /// 校验上日是否收盘
         /// </summary>
         /// <param name="tradeId"></param>

YLErpDAL/Modules/SwapModule/SwapTradeService.cs

@@ -1375,7 +1375,6 @@ namespace YLErp.Modules.SwapModule
                 position.PosiTradingFee = swap.PosiTradingFee;
                 position.PosiTradingFee=Math.Round(position.PosiTradingFee, ConsGlobal.MoneyRound, MidpointRounding.AwayFromZero);
                 position.PosiTradingFeeUnit = swap.PosiTradingFeeUnit;
-                position.PosiFeeType = swap.PosiFeeType;
                 position.PosiTradingFeePending = swap.PosiTradingFeePending;
                 position.PosiTradingFeePending = Math.Round(position.PosiTradingFeePending, ConsGlobal.MoneyRound, MidpointRounding.AwayFromZero);
                 position.UnderlyingCode = swap.UnderlyingCode;