Merge branch 'refs/heads/glms/feature/1.4.2' into glms/feature/0812_zmr_divPower

2026-08-21 17:09:15 +08:00
parent 392e36a820 3c7e25820a
commit fa63d4ee69
67 changed files with 1748 additions and 265 deletions
@@ -1250,6 +1250,10 @@ namespace YLErp.Modules.SwapModule
            {
                return;
            }
+            if (!new TradeApprovalOAService(this).ArchiveActiveForTrade(tradeObj, out var errorMessage))
+            {
+                throw new ServiceException(errorMessage);
+            }
            var eventTypes = new List<int>() { (int)SwapEventTypeEnum.修改交易, (int)SwapEventTypeEnum.新增交易, (int)SwapEventTypeEnum.平仓, (int)SwapEventTypeEnum.互换 };
            var lastEvent = DbContext.swap_event.Where(x => x.SwapTradeId == intid && eventTypes.Contains(x.EventType) && !x.Invalid).OrderByDescending(o => o.OptTime).FirstOrDefault();
            if (tradeObj.TradeStatus == ConsTrade.平仓待复核 || tradeObj.TradeStatus == ConsTrade.互换待复核)