直接换货流程

2026-06-03 16:55:32 +08:00
parent 46ede81aef
commit 5f57429fb0
13 changed files with 718 additions and 167 deletions
--- a/internal/service/asset/service.go
+++ b/internal/service/asset/service.go
@@ -1016,13 +1016,17 @@ func (s *Service) tracePreviousGenerations(ctx context.Context, assetType string
 		}

 		oldGeneration := s.resolveAssetGeneration(ctx, oldAssetType, exchOrder.OldAssetID)
+		exchangedAt := exchOrder.UpdatedAt
+		if exchOrder.CompletedAt != nil && !exchOrder.CompletedAt.IsZero() {
+			exchangedAt = *exchOrder.CompletedAt
+		}

 		prevGens = append(prevGens, &dto.PreviousGenerationOrders{
 			Generation:  oldGeneration,
 			Identifier:  exchOrder.OldAssetIdentifier,
 			AssetType:   oldAssetType,
 			ExchangeNo:  exchOrder.ExchangeNo,
-			ExchangedAt: exchOrder.UpdatedAt,
+			ExchangedAt: exchangedAt,
 			Total:       oldTotal,
 			Items:       orderItems,
 		})