fix: 标的成交记录逻辑修改
This commit is contained in:
@@ -21,7 +21,7 @@ namespace YLErp.Modules.ExchangeTradeModule
|
||||
|
||||
}
|
||||
|
||||
public int Save(ExchangeTradeSaveApiReq req,string tradeSource)
|
||||
public int Save(ExchangeTradeSaveApiReq req, string tradeSource)
|
||||
{
|
||||
if (req.TradeDate == DateTime.MinValue)
|
||||
{
|
||||
@@ -76,7 +76,7 @@ namespace YLErp.Modules.ExchangeTradeModule
|
||||
if (req.TradeNumber.EndsWith("_dzrh_"))
|
||||
{
|
||||
var lastTradeDate = QdpCalendarHelper.GetNonHolidayDefore(req.TradeDate.AddDays(-1));
|
||||
if(DbContext.ExchangeTrade.Any(x => (x.TradeDate == req.TradeDate || x.TradeDate == lastTradeDate) && x.TradeNumber == req.TradeNumber))
|
||||
if (DbContext.ExchangeTrade.Any(x => (x.TradeDate == req.TradeDate || x.TradeDate == lastTradeDate) && x.TradeNumber == req.TradeNumber))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -134,7 +134,7 @@ namespace YLErp.Modules.ExchangeTradeModule
|
||||
}
|
||||
|
||||
//将req转换交易对象
|
||||
private ExchangeTrade PrepareReqTrad(ExchangeTradeSaveApiReq req,string tradeSource= "下单同步")
|
||||
private ExchangeTrade PrepareReqTrad(ExchangeTradeSaveApiReq req, string tradeSource = "下单同步")
|
||||
{
|
||||
var td = new ExchangeTrade
|
||||
{
|
||||
@@ -275,7 +275,8 @@ namespace YLErp.Modules.ExchangeTradeModule
|
||||
a.VarietyIds,
|
||||
a.TraderIds,
|
||||
BookId = b != null ? b.id : 0,
|
||||
BookName = b != null ? b.Name : ""
|
||||
BookName = b != null ? b.Name : "",
|
||||
a.Description
|
||||
};
|
||||
|
||||
var accbooks = query.ToList();
|
||||
@@ -330,7 +331,7 @@ namespace YLErp.Modules.ExchangeTradeModule
|
||||
}
|
||||
}
|
||||
td.TraderId = trader?.Id ?? UserId;
|
||||
td.TraderName = trader?.Name ?? UserName ?? "系统";
|
||||
td.TraderName = (trader == null && !string.IsNullOrWhiteSpace(accbook?.Description)) ? accbook.Description.Trim() : trader?.Name ?? UserName ?? "系统";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user