diff --git a/src/CMSMicroservice.Application/DayaLoanCQ/Commands/CheckAndProcessDayaLoans/CheckAndProcessDayaLoansCommandHandler.cs b/src/CMSMicroservice.Application/DayaLoanCQ/Commands/CheckAndProcessDayaLoans/CheckAndProcessDayaLoansCommandHandler.cs
index fb0aa33..68defb2 100644
--- a/src/CMSMicroservice.Application/DayaLoanCQ/Commands/CheckAndProcessDayaLoans/CheckAndProcessDayaLoansCommandHandler.cs
+++ b/src/CMSMicroservice.Application/DayaLoanCQ/Commands/CheckAndProcessDayaLoans/CheckAndProcessDayaLoansCommandHandler.cs
@@ -231,7 +231,8 @@ public class CheckAndProcessDayaLoansCommandHandler : IRequestHandler<CheckAndPr
             CurrentNetworkBalance = wallet.NetworkBalance,
             ChangeNerworkValue = 0,
             IsIncrease = true,
-            RefrenceId = transaction.Id
+            RefrenceId = transaction.Id,
+            PackageId = package.Id
         };
         await _context.UserWalletHistories.AddAsync(mainLog, cancellationToken);
         
@@ -249,7 +250,8 @@ public class CheckAndProcessDayaLoansCommandHandler : IRequestHandler<CheckAndPr
             CurrentDiscountBalance = 0,
             ChangeDiscountValue = discountAmount,
             IsIncrease = true,
-            RefrenceId = transaction.Id
+            RefrenceId = transaction.Id,
+            PackageId = package.Id
         };
         await _context.UserWalletHistories.AddAsync(discountLog, cancellationToken);
         
diff --git a/src/CMSMicroservice.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs b/src/CMSMicroservice.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs
index 5ea6831..41947ef 100644
--- a/src/CMSMicroservice.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs
+++ b/src/CMSMicroservice.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs
@@ -130,7 +130,8 @@ public class CreateManualPaymentCommandHandler : IRequestHandler<CreateManualPay
                 CurrentDiscountBalance =0,
                 ChangeDiscountValue = discountBalanceAmount,
                 IsIncrease = true,
-                RefrenceId = transaction.Id
+                RefrenceId = transaction.Id,
+                PackageId = package.Id
             };
 
             await _context.UserWalletHistories.AddAsync(walletLog, cancellationToken);
diff --git a/src/CMSMicroservice.Application/PackageCQ/Commands/VerifyPackagePurchase/VerifyPackagePurchaseCommandHandler.cs b/src/CMSMicroservice.Application/PackageCQ/Commands/VerifyPackagePurchase/VerifyPackagePurchaseCommandHandler.cs
index fe76158..867b694 100644
--- a/src/CMSMicroservice.Application/PackageCQ/Commands/VerifyPackagePurchase/VerifyPackagePurchaseCommandHandler.cs
+++ b/src/CMSMicroservice.Application/PackageCQ/Commands/VerifyPackagePurchase/VerifyPackagePurchaseCommandHandler.cs
@@ -139,7 +139,8 @@ public class VerifyPackagePurchaseCommandHandler
                 CurrentDiscountBalance = wallet.DiscountBalance - discountAmount, // قبل از شارژ DiscountBalance
                 ChangeDiscountValue = 0,
                 IsIncrease = true,
-                RefrenceId = transaction.Id
+                RefrenceId = transaction.Id,
+                PackageId = order.PackageId
             };
             await _context.UserWalletHistories.AddAsync(balanceLog, cancellationToken);
 
@@ -154,7 +155,8 @@ public class VerifyPackagePurchaseCommandHandler
                 CurrentDiscountBalance = wallet.DiscountBalance,
                 ChangeDiscountValue = discountAmount,
                 IsIncrease = true,
-                RefrenceId = transaction.Id
+                RefrenceId = transaction.Id,
+                PackageId = order.PackageId
             };
             await _context.UserWalletHistories.AddAsync(discountLog, cancellationToken);
 
diff --git a/src/CMSMicroservice.Domain/Entities/Club/ClubMembershipCycle.cs b/src/CMSMicroservice.Domain/Entities/Club/ClubMembershipCycle.cs
index 05efe12..d155718 100644
--- a/src/CMSMicroservice.Domain/Entities/Club/ClubMembershipCycle.cs
+++ b/src/CMSMicroservice.Domain/Entities/Club/ClubMembershipCycle.cs
@@ -1,10 +1,13 @@
+using CMSMicroservice.Domain.Common;
+using CMSMicroservice.Domain.Enums;
+
 namespace CMSMicroservice.Domain.Entities.Club;
 
 /// <summary>
 /// دوره خرید پکیج — هر بار خرید پکیج ۵۶M یک Cycle جدید ایجاد می‌شود.
 /// برای حل مشکل overwrite شدن ClubMembership.ActivatedAt در محاسبه کمیسیون.
 /// </summary>
-public class ClubMembershipCycle : BaseAuditableEntity
+public class ClubMembershipCycle : BaseAuditableEntity, IHasHistory<History.ClubMembershipCycleHistory>
 {
     /// <summary>
     /// شناسه کاربر
@@ -74,4 +77,26 @@ public class ClubMembershipCycle : BaseAuditableEntity
 
     /// <summary>تاریخچه تغییرات دوره (Q27)</summary>
     public virtual ICollection<History.ClubMembershipCycleHistory>? CycleHistories { get; set; }
+
+    /// <summary>
+    /// ساخت snapshot تاریخچه از وضعیت فعلی چرخه.
+    /// مقادیر New* از وضعیت فعلی پر می‌شوند.
+    /// مقادیر Old* توسط HistoryTrackingSaveChangesInterceptor از OriginalValues پر می‌شوند.
+    /// </summary>
+    public History.ClubMembershipCycleHistory CreateHistorySnapshot(string action, string? performedBy)
+    {
+        return new History.ClubMembershipCycleHistory
+        {
+            ClubMembershipCycleId = Id,
+            UserId = UserId,
+            CycleNumber = CycleNumber,
+            NewIsCurrentCycle = IsCurrentCycle,
+            NewMagicStartedAt = MagicStartedAt,
+            NewMagicCompletedAt = MagicCompletedAt,
+            Action = Enum.TryParse<ClubMembershipCycleAction>(action, out var a)
+                ? a
+                : ClubMembershipCycleAction.ManualFix,
+            PerformedBy = performedBy
+        };
+    }
 }
diff --git a/src/CMSMicroservice.WebApi/Services/PackageService.cs b/src/CMSMicroservice.WebApi/Services/PackageService.cs
index 0942b26..3ad2be6 100644
--- a/src/CMSMicroservice.WebApi/Services/PackageService.cs
+++ b/src/CMSMicroservice.WebApi/Services/PackageService.cs
@@ -331,7 +331,8 @@ public class PackageService : PackageContract.PackageContractBase
                 CurrentDiscountBalance = wallet.DiscountBalance,
                 ChangeDiscountValue = discountAmount,
                 IsIncrease = true,
-                RefrenceId = transaction.Id
+                RefrenceId = transaction.Id,
+                PackageId = purchase.PackageId
             };
             _context.UserWalletHistories.Add(walletLog);