AssetManager.Infrastructure/Services/MarketDataService.cs

@@ -2,7 +2,6 @@ using AssetManager.Data;
 using AssetManager.Data.Repositories;
 using AssetManager.Models.DTOs;
 using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
 
 namespace AssetManager.Infrastructure.Services;
 
@@ -21,9 +20,6 @@ public class MarketDataService : IMarketDataService
     private readonly ITiingoMarketService _tiingoService;
     private readonly IOkxMarketService _okxService;
     private readonly IMarketDataRepository _marketDataRepo;
-    
-    // 防止并发请求同一股票
-    private readonly ConcurrentDictionary<string, Task<MarketPriceResponse>> _pendingPriceRequests = new();
 
     public MarketDataService(
         ILogger<MarketDataService> logger,
@@ -43,11 +39,9 @@ public class MarketDataService : IMarketDataService
 
     /// <summary>
     /// 获取实时价格（自动根据资产类型路由到对应数据源）
-    /// 使用并发控制防止重复请求
     /// </summary>
     public async Task<MarketPriceResponse> GetPriceAsync(string symbol, string assetType)
     {
-        var cacheKey = $"{symbol.ToUpper()}_{assetType.ToUpper()}";
         _logger.LogInformation("获取实时价格: {Symbol}, 资产类型: {AssetType}", symbol, assetType);
         
         // 先查缓存
@@ -66,27 +60,7 @@ public class MarketDataService : IMarketDataService
             };
         }
 
-        // 使用 GetOrAdd 模式防止并发重复请求
-        var priceTask = _pendingPriceRequests.GetOrAdd(cacheKey, _ => FetchPriceFromSourceAsync(symbol, assetType));
-        
-        try
-        {
-            return await priceTask;
-        }
-        finally
-        {
-            // 请求完成后移除（无论成功失败）
-            _pendingPriceRequests.TryRemove(cacheKey, out _);
-        }
-    }
-
-    /// <summary>
-    /// 从数据源获取价格（内部方法）
-    /// </summary>
-    private async Task<MarketPriceResponse> FetchPriceFromSourceAsync(string symbol, string assetType)
-    {
-        _logger.LogInformation("从数据源获取价格: {Symbol}, 资产类型: {AssetType}", symbol, assetType);
-        
+        // 缓存未命中，调用API
         MarketPriceResponse response;
         string source;
         

AssetManager.Services/PortfolioService.cs

@@ -657,15 +657,15 @@ public class PortfolioService : IPortfolioService
         {
             if (DateTime.TryParse(request.TransactionDate, out var parsedDate))
             {
-                transactionTime = parsedDate.Date;
+                // 如果只传了日期，时间部分默认用当前时间
+                transactionTime = parsedDate.Date + DateTime.Now.TimeOfDay;
             }
         }
-        // 组合时间部分
-        if (!string.IsNullOrEmpty(request.TransactionTime))
+        else if (!string.IsNullOrEmpty(request.TransactionTime))
         {
-            if (TimeSpan.TryParse(request.TransactionTime, out var parsedTime))
+            if (DateTime.TryParse(request.TransactionTime, out var parsedTime))
             {
-                transactionTime = transactionTime.Date + parsedTime;
+                transactionTime = parsedTime;
             }
         }
 
@@ -821,16 +821,12 @@ public class PortfolioService : IPortfolioService
         request.PortfolioId = portfolioId;
         var response = await CreateTransaction(request, userId);
         
-        // 使用实际交易时间
-        var transactionDate = request.TransactionDate ?? DateTime.Now.ToString("yyyy-MM-dd");
-        var transactionTime = request.TransactionTime ?? DateTime.Now.ToString("HH:mm");
-        
         return new TransactionItem
         {
             Id = response.Id,
             PortfolioId = portfolioId,
-            Date = transactionDate,
-            Time = transactionTime,
+            Date = DateTime.Now.ToString("yyyy-MM-dd"),
+            Time = DateTime.Now.ToString("HH:mm:ss"),
             Type = request.Type,
             StockCode = request.StockCode,
             Amount = response.TotalAmount,