Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化“收益互换”确认书查询与编号生成逻辑

Browse Source
This commit is contained in:
锦麟 王
2026-04-14 11:24:03 +08:00
parent 130cbedaba
commit f11e8ea27a
6 changed files with 94 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs
+2 -42
View File
@@ -229,49 +229,9 @@ namespace YLErp.Modules.TradeModule.DealModule
var clientIds = trades.Select(x => x.ClientId).Distinct().ToList();
logger.Info($"[GJGenerateConfirmBook] 客户ID数: {clientIds.Count}");
if (trades.Any(o => o.TradeType.Equals("收益互换")))
foreach (var item in trades)
{
var allTrades = DbContext.trade.Where(x => clientIds.Contains(x.ClientId) && x.TradeType.Equals("收益互换") && x.ValidState != ConsGlobal.InValid);
if (startDate.HasValue)
{
allTrades = allTrades.Where(x => x.TradeDate >= startDate);
}
if (endDate.HasValue)
{
allTrades = allTrades.Where(x => x.TradeDate <= endDate);
}
var Ids = allTrades.Select(o => o.id).Distinct().ToArray();
var swapPositions = DbContext.swap_position.Where(s => Ids.Contains(s.SwapTradeId) && s.IsInitial && s.PositionType > 0 && !s.Invalid)
.Distinct().ToList();
logger.Info($"[GJGenerateConfirmBook] 查询到持仓记录数: {swapPositions.Count}");
var allTradeList = allTrades.AsNoTracking().ToList();
foreach (var item in allTradeList)
{
item.swap_positions.Add(swapPositions.FirstOrDefault(o => o.SwapTradeId == item.id));
}
allTradeList = allTradeList.Where(x => x.swap_positions.Any()).ToList();
logger.Info($"[GJGenerateConfirmBook] 过滤后有持仓的交易数: {allTradeList.Count}");
// 按照客户ID、交易日期、多空头进行分组
var group = allTradeList.GroupBy(O => new { O.ClientId, O.StartDate, O.swap_positions.FirstOrDefault()?.PositionType })
.ToDictionary(K => K.Key, V => V.Select(O => O.id).ToList());
logger.Info($"[GJGenerateConfirmBook] 分组数: {group.Count}");
foreach (var item in group)
{
var tradeCount = item.Value.Distinct().Count();
logger.Info($"[GJGenerateConfirmBook] 处理分组 - ClientId: {item.Key.ClientId}, StartDate: {item.Key.StartDate}, PositionType: {item.Key.PositionType}, 交易数: {tradeCount}");
groupGenerateHandle(item.Value.Distinct().ToList(), docType, startDate, endDate, results, error, file);
}
}
else
{
foreach (var item in trades)
{
groupGenerateHandle_Date(new List<int> { item.id }, docType, startDate, endDate, results, error, file);
}
groupGenerateHandle_Date(new List<int> { item.id }, docType, startDate, endDate, results, error, file);
}
errors = results.Where(n => !string.IsNullOrWhiteSpace(n.ErrorMessage)).Select(n => n.ErrorMessage).ToList();
YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs
+19 -1
View File
@@ -1278,9 +1278,11 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
contractNo = GenerateShanXiGuShouContractNo();
break;
case CompanyEnum.浙商:
case CompanyEnum.国联:
contractNo = GenerateZheShangContractNo();
break;
case CompanyEnum.国联:
contractNo = GenerateGuolianContractNo();
break;
default:
throw new ContextMarshalException("未实现");
}
@@ -1336,6 +1338,22 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
}
return Trade.TradeNumber;
}
private string GenerateGuolianContractNo()
{
if (_contractType != ContractTypeEnum.Trade)
{
return UniqueTimeId.GetStr();
}
if (Trade.TradeType == "收益互换")
{
var posi = GetSwapPositions(Trade.id, true).FirstOrDefault(p => p.PositionType > 0);
var isLong = posi?.PositionType == (int)PositionTypeFlag.Short ? false : true;
return "GLMS-" + _client.Number + "-" + Trade.TradeNumber;
}
return Trade.TradeNumber;
}
/// <summary>
/// 生成国贸确认书编号
/// </summary>