feat: add IsActive field to UserClubFeatures for admin management

2025-12-12 01:40:26 +03:30
parent aa66ca10c8
commit ff1c1d5d61
68 changed files with 11456 additions and 198 deletions
--- a/src/CMSMicroservice.Application/ClubFeatureCQ/Commands/ToggleUserClubFeature/ToggleUserClubFeatureCommand.cs
+++ b/src/CMSMicroservice.Application/ClubFeatureCQ/Commands/ToggleUserClubFeature/ToggleUserClubFeatureCommand.cs
@@ -0,0 +1,24 @@
+using MediatR;
+
+namespace CMSMicroservice.Application.ClubFeatureCQ.Commands.ToggleUserClubFeature;
+
+/// <summary>
+/// کامند برای فعال/غیرفعال کردن یک ویژگی باشگاه برای کاربر
+/// </summary>
+public record ToggleUserClubFeatureCommand : IRequest<ToggleUserClubFeatureResponse>
+{
+    /// <summary>
+    /// شناسه کاربر
+    /// </summary>
+    public long UserId { get; init; }
+
+    /// <summary>
+    /// شناسه ویژگی باشگاه
+    /// </summary>
+    public long ClubFeatureId { get; init; }
+
+    /// <summary>
+    /// وضعیت مورد نظر (فعال/غیرفعال)
+    /// </summary>
+    public bool IsActive { get; init; }
+}
--- a/src/CMSMicroservice.Application/ClubFeatureCQ/Commands/ToggleUserClubFeature/ToggleUserClubFeatureCommandHandler.cs
+++ b/src/CMSMicroservice.Application/ClubFeatureCQ/Commands/ToggleUserClubFeature/ToggleUserClubFeatureCommandHandler.cs
@@ -0,0 +1,78 @@
+using CMSMicroservice.Application.Common.Interfaces;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace CMSMicroservice.Application.ClubFeatureCQ.Commands.ToggleUserClubFeature;
+
+/// <summary>
+/// هندلر برای فعال/غیرفعال کردن ویژگی باشگاه کاربر
+/// </summary>
+public class ToggleUserClubFeatureCommandHandler : IRequestHandler<ToggleUserClubFeatureCommand, ToggleUserClubFeatureResponse>
+{
+    private readonly IApplicationDbContext _context;
+
+    public ToggleUserClubFeatureCommandHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<ToggleUserClubFeatureResponse> Handle(ToggleUserClubFeatureCommand request, CancellationToken cancellationToken)
+    {
+        // بررسی وجود کاربر
+        var userExists = await _context.Users
+            .AnyAsync(u => u.Id == request.UserId && !u.IsDeleted, cancellationToken);
+
+        if (!userExists)
+        {
+            return new ToggleUserClubFeatureResponse
+            {
+                Success = false,
+                Message = "کاربر یافت نشد"
+            };
+        }
+
+        // بررسی وجود ویژگی
+        var featureExists = await _context.ClubFeatures
+            .AnyAsync(cf => cf.Id == request.ClubFeatureId && !cf.IsDeleted, cancellationToken);
+
+        if (!featureExists)
+        {
+            return new ToggleUserClubFeatureResponse
+            {
+                Success = false,
+                Message = "ویژگی باشگاه یافت نشد"
+            };
+        }
+
+        // یافتن رکورد UserClubFeature
+        var userClubFeature = await _context.UserClubFeatures
+            .FirstOrDefaultAsync(
+                ucf => ucf.UserId == request.UserId 
+                    && ucf.ClubFeatureId == request.ClubFeatureId 
+                    && !ucf.IsDeleted,
+                cancellationToken);
+
+        if (userClubFeature == null)
+        {
+            return new ToggleUserClubFeatureResponse
+            {
+                Success = false,
+                Message = "این ویژگی برای کاربر یافت نشد"
+            };
+        }
+
+        // به‌روزرسانی وضعیت
+        userClubFeature.IsActive = request.IsActive;
+        userClubFeature.LastModified = DateTime.UtcNow;
+
+        await _context.SaveChangesAsync(cancellationToken);
+
+        return new ToggleUserClubFeatureResponse
+        {
+            Success = true,
+            Message = request.IsActive ? "ویژگی با موفقیت فعال شد" : "ویژگی با موفقیت غیرفعال شد",
+            UserClubFeatureId = userClubFeature.Id,
+            IsActive = userClubFeature.IsActive
+        };
+    }
+}
--- a/src/CMSMicroservice.Application/ClubFeatureCQ/Commands/ToggleUserClubFeature/ToggleUserClubFeatureResponse.cs
+++ b/src/CMSMicroservice.Application/ClubFeatureCQ/Commands/ToggleUserClubFeature/ToggleUserClubFeatureResponse.cs
@@ -0,0 +1,27 @@
+namespace CMSMicroservice.Application.ClubFeatureCQ.Commands.ToggleUserClubFeature;
+
+/// <summary>
+/// پاسخ کامند فعال/غیرفعال کردن ویژگی باشگاه
+/// </summary>
+public class ToggleUserClubFeatureResponse
+{
+    /// <summary>
+    /// موفقیت عملیات
+    /// </summary>
+    public bool Success { get; set; }
+
+    /// <summary>
+    /// پیام
+    /// </summary>
+    public string Message { get; set; }
+
+    /// <summary>
+    /// شناسه رکورد UserClubFeature
+    /// </summary>
+    public long? UserClubFeatureId { get; set; }
+
+    /// <summary>
+    /// وضعیت جدید
+    /// </summary>
+    public bool? IsActive { get; set; }
+}
--- a/src/CMSMicroservice.Application/ClubFeatureCQ/Queries/GetUserClubFeatures/GetUserClubFeaturesQuery.cs
+++ b/src/CMSMicroservice.Application/ClubFeatureCQ/Queries/GetUserClubFeatures/GetUserClubFeaturesQuery.cs
@@ -0,0 +1,14 @@
+using MediatR;
+
+namespace CMSMicroservice.Application.ClubFeatureCQ.Queries.GetUserClubFeatures;
+
+/// <summary>
+/// دریافت لیست ویژگی‌های باشگاه اختصاص یافته به کاربر
+/// </summary>
+public record GetUserClubFeaturesQuery : IRequest<List<UserClubFeatureDto>>
+{
+    /// <summary>
+    /// شناسه کاربر
+    /// </summary>
+    public long UserId { get; init; }
+}
--- a/src/CMSMicroservice.Application/ClubFeatureCQ/Queries/GetUserClubFeatures/GetUserClubFeaturesQueryHandler.cs
+++ b/src/CMSMicroservice.Application/ClubFeatureCQ/Queries/GetUserClubFeatures/GetUserClubFeaturesQueryHandler.cs
@@ -0,0 +1,40 @@
+using CMSMicroservice.Application.Common.Interfaces;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace CMSMicroservice.Application.ClubFeatureCQ.Queries.GetUserClubFeatures;
+
+/// <summary>
+/// هندلر برای دریافت لیست ویژگی‌های باشگاه یک کاربر
+/// </summary>
+public class GetUserClubFeaturesQueryHandler : IRequestHandler<GetUserClubFeaturesQuery, List<UserClubFeatureDto>>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetUserClubFeaturesQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<List<UserClubFeatureDto>> Handle(GetUserClubFeaturesQuery request, CancellationToken cancellationToken)
+    {
+        var userClubFeatures = await _context.UserClubFeatures
+            .Include(ucf => ucf.ClubFeature)
+            .Where(ucf => ucf.UserId == request.UserId && !ucf.IsDeleted)
+            .Select(ucf => new UserClubFeatureDto
+            {
+                Id = ucf.Id,
+                UserId = ucf.UserId,
+                ClubMembershipId = ucf.ClubMembershipId,
+                ClubFeatureId = ucf.ClubFeatureId,
+                FeatureTitle = ucf.ClubFeature.Title,
+                FeatureDescription = ucf.ClubFeature.Description,
+                IsActive = ucf.IsActive,
+                GrantedAt = ucf.GrantedAt,
+                Notes = ucf.Notes
+            })
+            .ToListAsync(cancellationToken);
+
+        return userClubFeatures;
+    }
+}
--- a/src/CMSMicroservice.Application/ClubFeatureCQ/Queries/GetUserClubFeatures/UserClubFeatureDto.cs
+++ b/src/CMSMicroservice.Application/ClubFeatureCQ/Queries/GetUserClubFeatures/UserClubFeatureDto.cs
@@ -0,0 +1,52 @@
+namespace CMSMicroservice.Application.ClubFeatureCQ.Queries.GetUserClubFeatures;
+
+/// <summary>
+/// DTO برای ویژگی‌های باشگاه کاربر
+/// </summary>
+public class UserClubFeatureDto
+{
+    /// <summary>
+    /// شناسه رکورد UserClubFeature
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// شناسه کاربر
+    /// </summary>
+    public long UserId { get; set; }
+
+    /// <summary>
+    /// شناسه عضویت باشگاه
+    /// </summary>
+    public long ClubMembershipId { get; set; }
+
+    /// <summary>
+    /// شناسه ویژگی باشگاه
+    /// </summary>
+    public long ClubFeatureId { get; set; }
+
+    /// <summary>
+    /// عنوان ویژگی
+    /// </summary>
+    public string FeatureTitle { get; set; }
+
+    /// <summary>
+    /// توضیحات ویژگی
+    /// </summary>
+    public string? FeatureDescription { get; set; }
+
+    /// <summary>
+    /// وضعیت فعال/غیرفعال ویژگی برای این کاربر
+    /// </summary>
+    public bool IsActive { get; set; }
+
+    /// <summary>
+    /// تاریخ اعطای ویژگی
+    /// </summary>
+    public DateTime GrantedAt { get; set; }
+
+    /// <summary>
+    /// یادداشت
+    /// </summary>
+    public string? Notes { get; set; }
+}
--- a/src/CMSMicroservice.Application/ClubMembershipCQ/Commands/ActivateClubMembership/ActivateClubMembershipCommandHandler.cs
+++ b/src/CMSMicroservice.Application/ClubMembershipCQ/Commands/ActivateClubMembership/ActivateClubMembershipCommandHandler.cs
@@ -3,11 +3,13 @@ using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Application.Common.Models;
 using CMSMicroservice.Domain.Entities;
 using CMSMicroservice.Domain.Entities.Club;
+using CMSMicroservice.Domain.Entities.Commission;
 using CMSMicroservice.Domain.Entities.History;
 using CMSMicroservice.Domain.Enums;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+using System.Globalization;

 namespace CMSMicroservice.Application.ClubMembershipCQ.Commands.ActivateClubMembership;

@@ -135,9 +137,15 @@ public class ActivateClubMembershipCommandHandler : IRequestHandler<ActivateClub
                .FirstOrDefaultAsync(
                    c => c.Key == "Club.MembershipGiftValue" && c.IsActive,
                    cancellationToken
+                ); 
+            
+            var activationFeeConfig = await _context.SystemConfigurations
+                .FirstOrDefaultAsync(
+                    c => c.Key == "Club.ActivationFee" && c.IsActive,
+                    cancellationToken
                );
            
-            long giftValue = 25_200_000; // مقدار پیش‌فرض
+            long giftValue = 28_000_000; // مقدار پیش‌فرض
            if (giftValueConfig != null && long.TryParse(giftValueConfig.Value, out var configValue))
            {
                giftValue = configValue;
@@ -152,11 +160,27 @@ public class ActivateClubMembershipCommandHandler : IRequestHandler<ActivateClub
                    "Club.MembershipGiftValue not found in configuration, using default: {GiftValue}",
                    giftValue
                );
+            }  
+            long activationFeeValue = 25_200_000; // مقدار پیش‌فرض
+            if (activationFeeConfig != null && long.TryParse(activationFeeConfig.Value, out var activationFeeConfigValue))
+            {
+                activationFeeValue = activationFeeConfigValue;
+                _logger.LogInformation(
+                    "Using Club.ActivationFee from configuration: {activationFeeValue}",
+                    activationFeeValue
+                );
+            }
+            else
+            {
+                _logger.LogWarning(
+                    "Club.ActivationFee not found in configuration, using default: {activationFeeValue}",
+                    activationFeeValue
+                );
            }

            ClubMembership entity;
            bool isNewMembership = existingMembership == null;
-            var activationDate = DateTime.UtcNow;
+            var activationDate = DateTime.Now;

            if (isNewMembership)
            {
@@ -166,7 +190,7 @@ public class ActivateClubMembershipCommandHandler : IRequestHandler<ActivateClub
                    UserId = user.Id,
                    IsActive = true,
                    ActivatedAt = activationDate,
-                    InitialContribution = 56_000_000,
+                    InitialContribution =activationFeeValue,
                    GiftValue = giftValue, // مقدار از تنظیمات
                    TotalEarned = 0,
                    PurchaseMethod = user.PackagePurchaseMethod
@@ -225,6 +249,83 @@ public class ActivateClubMembershipCommandHandler : IRequestHandler<ActivateClub
            _context.ClubMembershipHistories.Add(history);
            await _context.SaveChangesAsync(cancellationToken);

+            // ⭐ 8. اضافه کردن مبلغ به Pool هفته جاری
+            var currentWeekNumber = GetCurrentWeekNumber();
+            var weeklyPool = await _context.WeeklyCommissionPools
+                .FirstOrDefaultAsync(p => p.WeekNumber == currentWeekNumber, cancellationToken);
+
+            if (weeklyPool == null)
+            {
+                // ایجاد Pool جدید برای این هفته
+                weeklyPool = new WeeklyCommissionPool
+                {
+                    WeekNumber = currentWeekNumber,
+                    TotalPoolAmount = activationFeeValue, // مبلغ هدیه به Pool اضافه میشه
+                    TotalBalances = 0, // در CalculateWeeklyBalances محاسبه میشه
+                    ValuePerBalance = 0, // در CalculateWeeklyCommissionPool محاسبه میشه
+                    IsCalculated = false,
+                    CalculatedAt = null
+                };
+
+                await _context.WeeklyCommissionPools.AddAsync(weeklyPool, cancellationToken);
+                
+                _logger.LogInformation(
+                    "Created new WeeklyCommissionPool for {WeekNumber} with initial amount: {Amount}",
+                    currentWeekNumber,
+                    giftValue
+                );
+            }
+            else
+            {
+                // اضافه کردن به Pool موجود
+                weeklyPool.TotalPoolAmount += activationFeeValue;
+                _context.WeeklyCommissionPools.Update(weeklyPool);
+                
+                _logger.LogInformation(
+                    "Added {Amount} to existing WeeklyCommissionPool for {WeekNumber}. New total: {NewTotal}",
+                    activationFeeValue,
+                    currentWeekNumber,
+                    weeklyPool.TotalPoolAmount
+                );
+            }
+
+            await _context.SaveChangesAsync(cancellationToken);
+
+            // 9. اضافه کردن ویژگی‌های باشگاه برای کاربر (فقط برای عضویت جدید)
+            if (isNewMembership)
+            {
+                var clubFeatures = await _context.ClubFeatures
+                    .Where(f => !f.IsDeleted && new long[] { 1, 2, 3, 4 }.Contains(f.Id))
+                    .ToListAsync(cancellationToken);
+
+                if (clubFeatures.Any())
+                {
+                var userClubFeatures = clubFeatures.Select(feature => new UserClubFeature
+                {
+                    UserId = user.Id,
+                    ClubMembershipId = entity.Id,
+                    ClubFeatureId = feature.Id,
+                    GrantedAt = activationDate,
+                    IsActive = true,
+                    Notes = "اعطا شده به‌طور خودکار هنگام فعالسازی"
+                }).ToList();                    _context.UserClubFeatures.AddRange(userClubFeatures);
+                    await _context.SaveChangesAsync(cancellationToken);
+
+                    _logger.LogInformation(
+                        "Granted {Count} club features to UserId {UserId}",
+                        clubFeatures.Count,
+                        user.Id
+                    );
+                }
+                else
+                {
+                    _logger.LogWarning(
+                        "No club features found to grant to UserId {UserId}",
+                        user.Id
+                    );
+                }
+            }
+
            _logger.LogInformation(
                "Club membership activated successfully. UserId: {UserId}, MembershipId: {MembershipId}",
                user.Id,
@@ -243,4 +344,15 @@ public class ActivateClubMembershipCommandHandler : IRequestHandler<ActivateClub
            throw;
        }
    }
+
+    /// <summary>
+    /// دریافت شماره هفته جاری (مثال: "2025-W50")
+    /// </summary>
+    private string GetCurrentWeekNumber()
+    {
+        var now = DateTime.Now;
+        var calendar = CultureInfo.CurrentCulture.Calendar;
+        var weekOfYear = calendar.GetWeekOfYear(now, CalendarWeekRule.FirstDay, DayOfWeek.Saturday);
+        return $"{now.Year}-W{weekOfYear:D2}";
+    }
 }
--- a/src/CMSMicroservice.Application/ClubMembershipCQ/Commands/AssignClubFeature/AssignClubFeatureCommandHandler.cs
+++ b/src/CMSMicroservice.Application/ClubMembershipCQ/Commands/AssignClubFeature/AssignClubFeatureCommandHandler.cs
@@ -54,7 +54,7 @@ public class AssignClubFeatureCommandHandler : IRequestHandler<AssignClubFeature
                UserId = request.UserId,
                ClubMembershipId = membership.Id,
                ClubFeatureId = request.FeatureId,
-                GrantedAt = request.GrantedAt ?? DateTime.UtcNow,
+                GrantedAt = request.GrantedAt ?? DateTime.Now,
                Notes = request.Notes
            };

--- a/src/CMSMicroservice.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs
+++ b/src/CMSMicroservice.Application/ClubMembershipCQ/Queries/GetClubStatistics/GetClubStatisticsQueryHandler.cs
@@ -11,7 +11,7 @@ public class GetClubStatisticsQueryHandler : IRequestHandler<GetClubStatisticsQu

    public async Task<GetClubStatisticsResponseDto> Handle(GetClubStatisticsQuery request, CancellationToken cancellationToken)
    {
-        var now = DateTime.UtcNow;
+        var now = DateTime.Now;

        // Basic statistics
        var totalMembers = await _context.ClubMemberships.CountAsync(cancellationToken);
--- a/src/CMSMicroservice.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Commands/ApproveWithdrawal/ApproveWithdrawalCommandHandler.cs
@@ -33,10 +33,10 @@ public class ApproveWithdrawalCommandHandler : IRequestHandler<ApproveWithdrawal

        // Update status to Withdrawn (approved)
        payout.Status = CommissionPayoutStatus.Withdrawn;
-        payout.WithdrawnAt = DateTime.UtcNow;
+        payout.WithdrawnAt = DateTime.Now;
        payout.ProcessedBy = _currentUser.GetPerformedBy();
-        payout.ProcessedAt = DateTime.UtcNow;
-        payout.LastModified = DateTime.UtcNow;
+        payout.ProcessedAt = DateTime.Now;
+        payout.LastModified = DateTime.Now;

        // TODO: Add PayoutHistory record
        // var history = new CommissionPayoutHistory
@@ -51,7 +51,7 @@ public class ApproveWithdrawalCommandHandler : IRequestHandler<ApproveWithdrawal
        //     Action = (int)CommissionPayoutAction.Approved,
        //     PerformedBy = "Admin", // TODO: Get from authenticated user
        //     Reason = request.Notes,
-        //     Created = DateTime.UtcNow
+        //     Created = DateTime.Now
        // };
        // _context.CommissionPayoutHistories.Add(history);

--- a/src/CMSMicroservice.Application/CommissionCQ/Commands/CalculateWeeklyBalances/CalculateWeeklyBalancesCommandHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Commands/CalculateWeeklyBalances/CalculateWeeklyBalancesCommandHandler.cs
@@ -28,9 +28,17 @@ public class CalculateWeeklyBalancesCommandHandler : IRequestHandler<CalculateWe
            await _context.SaveChangesAsync(cancellationToken);
        }

-        // دریافت کاربران فعال در شبکه
+        // ⭐ دریافت همه کاربرانی که عضو فعال باشگاه هستند
+        // بدون محدودیت زمانی - همه اعضای فعال کلاب باید کمیسیون بگیرند
+        var activeClubMemberUserIds = await _context.ClubMemberships
+            .Where(c => c.IsActive)
+            .Select(c => c.UserId)
+            .ToHashSetAsync(cancellationToken);
+
+        // دریافت کاربران فعال در شبکه که عضو باشگاه هستند
+        // نکته: شرط NetworkParentId.HasValue نداریم چون ریشه شبکه (اولین نفر) هم باید حساب بشه
        var usersInNetwork = await _context.Users
-            .Where(x => x.NetworkParentId.HasValue)
+            .Where(x => activeClubMemberUserIds.Contains(x.Id))
            .Select(x => new { x.Id })
            .ToListAsync(cancellationToken);

@@ -47,7 +55,7 @@ public class CalculateWeeklyBalancesCommandHandler : IRequestHandler<CalculateWe
            .ToDictionaryAsync(x => x.UserId, cancellationToken);

        var balancesList = new List<NetworkWeeklyBalance>();
-        var calculatedAt = DateTime.UtcNow;
+        var calculatedAt = DateTime.Now;

        // خواندن یکباره Configuration ها (بهینه‌سازی - به جای N query)
        var configs = await _context.SystemConfigurations
@@ -57,15 +65,15 @@ public class CalculateWeeklyBalancesCommandHandler : IRequestHandler<CalculateWe
                x.Key == "Commission.MaxWeeklyBalancesPerLeg" ||
                x.Key == "Commission.MaxNetworkLevel"))
            .ToDictionaryAsync(x => x.Key, x => x.Value, cancellationToken);
-
-        var activationFee = long.Parse(configs.GetValueOrDefault("Club.ActivationFee", "25000000"));
-        var poolPercent = decimal.Parse(configs.GetValueOrDefault("Commission.WeeklyPoolContributionPercent", "20")) / 100m;
+        
+        // var activationFee = long.Parse(configs.GetValueOrDefault("Club.ActivationFee", "25000000"));
+        // var poolPercent = decimal.Parse(configs.GetValueOrDefault("Commission.WeeklyPoolContributionPercent", "20")) / 100m;
        // سقف تعادل هفتگی برای هر دست (نه کل) - 300 برای چپ + 300 برای راست = حداکثر 600 تعادل
        var maxBalancesPerLeg = int.Parse(configs.GetValueOrDefault("Commission.MaxWeeklyBalancesPerLeg", "300"));
        // حداکثر عمق شبکه برای شمارش اعضا (15 لول)
        var maxNetworkLevel = int.Parse(configs.GetValueOrDefault("Commission.MaxNetworkLevel", "15"));

-        foreach (var user in usersInNetwork)
+        foreach (var user in usersInNetwork.OrderBy(o=>o.Id))
        {
            // دریافت باقیمانده هفته قبل
            var leftCarryover = 0;
@@ -84,29 +92,34 @@ public class CalculateWeeklyBalancesCommandHandler : IRequestHandler<CalculateWe
            var leftTotal = leftNewMembers + leftCarryover;
            var rightTotal = rightNewMembers + rightCarryover;

-            // ✅ اصلاح شده: اعمال سقف روی هر دست جداگانه (نه روی کل)
-            // سقف 300 برای دست چپ + 300 برای دست راست = حداکثر 600 تعادل در هفته
-            var cappedLeftTotal = Math.Min(leftTotal, maxBalancesPerLeg);
-            var cappedRightTotal = Math.Min(rightTotal, maxBalancesPerLeg);
+            // ✅ مرحله 1: محاسبه تعادل اولیه (قبل از اعمال سقف)
+            // تعادل = کمترین مقدار بین چپ و راست
+            // مثال: چپ=500، راست=600 → تعادل=500
+            var totalBalances = Math.Min(leftTotal, rightTotal);

-            // محاسبه تعادل (کمترین مقدار بعد از اعمال سقف)
-            var totalBalances = Math.Min(cappedLeftTotal, cappedRightTotal);
+            // ✅ مرحله 2: محاسبه باقیمانده (قبل از سقف)
+            // باقیمانده = اضافه‌ای که یک طرف دارد
+            // مثال: چپ=500، راست=600، تعادل=500
+            //   → باقی چپ = 500-500 = 0
+            //   → باقی راست = 600-500 = 100 (می‌رود برای هفته بعد)
+            var leftRemainder = leftTotal - totalBalances;
+            var rightRemainder = rightTotal - totalBalances;

-            // محاسبه باقیمانده برای هفته بعد
-            // باقیمانده = مقداری که از سقف هر دست رد شده
-            // مثال: چپ=350، راست=450، سقف=300
-            // cappedLeft = MIN(350, 300) = 300
-            // cappedRight = MIN(450, 300) = 300
-            // totalBalances = MIN(300, 300) = 300
-            // leftRemainder = 350 - 300 = 50 (مازاد سقف)
-            // rightRemainder = 450 - 300 = 150 (مازاد سقف)
-            var leftRemainder = leftTotal - cappedLeftTotal;
-            var rightRemainder = rightTotal - cappedRightTotal;
+            // ✅ مرحله 3: اعمال سقف 300 (برای امتیاز نهایی)
+            // از تعادل، فقط 300 از هر طرف حساب می‌شود
+            // مثال: تعادل=500 → امتیاز=300
+            //   از چپ: 300 حساب می‌شود، 200 فلش می‌شود
+            //   از راست: 300 حساب می‌شود، 200 فلش می‌شود
+            //   جمع فلش = 400 (از بین می‌رود)
+            var cappedBalances = Math.Min(totalBalances, maxBalancesPerLeg);
+            
+            // ✅ مرحله 4: محاسبه فلش (از هر دو طرف)
+            var flushedPerSide = totalBalances - cappedBalances; // 500-300=200
+            var totalFlushed = flushedPerSide * 2; // 200×2=400 (از بین می‌رود)

-            // محاسبه سهم استخر (20% از مجموع فعال‌سازی‌های جدید کل شبکه)
-            // طبق گفته دکتر: کل افراد جدید در شبکه × هزینه فعال‌سازی × 20%
-            var totalNewMembers = leftNewMembers + rightNewMembers;
-            var weeklyPoolContribution = (long)(totalNewMembers * activationFee * poolPercent);
+            // ⚠️ توجه: تعادل زیرمجموعه در این مرحله محاسبه نمیشه
+            // چون هنوز تمام تعادل‌ها محاسبه نشدن
+            // بعد از ذخیره همه تعادل‌ها، در یک حلقه دوم محاسبه خواهد شد

            var balance = new NetworkWeeklyBalance
            {
@@ -122,19 +135,26 @@ public class CalculateWeeklyBalancesCommandHandler : IRequestHandler<CalculateWe
                // مجموع
                LeftLegTotal = leftTotal,
                RightLegTotal = rightTotal,
-                TotalBalances = totalBalances, // تعادل واقعی بعد از اعمال سقف روی هر دست
+                TotalBalances = cappedBalances, // امتیاز نهایی بعد از اعمال سقف 300
                
-                // باقیمانده برای هفته بعد (مازاد سقف هر دست)
+                // باقیمانده برای هفته بعد (اضافه‌ای که یک طرف دارد)
                LeftLegRemainder = leftRemainder,
                RightLegRemainder = rightRemainder,
                
+                // فلش (از دست رفته)
+                FlushedPerSide = flushedPerSide,
+                TotalFlushed = totalFlushed,
+                
+                // تعادل زیرمجموعه - فعلاً 0 (بعد از ذخیره همه تعادل‌ها محاسبه میشه)
+                SubordinateBalances = 0,
+                
                // فیلدهای قدیمی (deprecated) - برای سازگاری با کدهای قبلی
 #pragma warning disable CS0618
                LeftLegBalances = leftTotal,
                RightLegBalances = rightTotal,
 #pragma warning restore CS0618
                
-                WeeklyPoolContribution = weeklyPoolContribution,
+                WeeklyPoolContribution = 0, // Pool در مرحله بعد محاسبه میشه
                CalculatedAt = calculatedAt,
                IsExpired = false
            };
@@ -145,6 +165,26 @@ public class CalculateWeeklyBalancesCommandHandler : IRequestHandler<CalculateWe
        await _context.NetworkWeeklyBalances.AddRangeAsync(balancesList, cancellationToken);
        await _context.SaveChangesAsync(cancellationToken);

+        // ⭐ مرحله 2: محاسبه تعادل زیرمجموعه برای هر کاربر (تا 15 لول)
+        // حالا که همه تعادل‌ها ذخیره شدن، می‌تونیم تعادل زیرمجموعه رو حساب کنیم
+        var balancesDictionary = balancesList.ToDictionary(x => x.UserId);
+        
+        foreach (var balance in balancesList)
+        {
+            var subordinateBalances = await CalculateSubordinateBalancesAsync(
+                balance.UserId,
+                balancesDictionary,
+                maxNetworkLevel,
+                cancellationToken
+            );
+
+            balance.SubordinateBalances = subordinateBalances;
+        }
+
+        // ذخیره تعادل‌های زیرمجموعه
+        _context.NetworkWeeklyBalances.UpdateRange(balancesList);
+        await _context.SaveChangesAsync(cancellationToken);
+
        return balancesList.Count;
    }

@@ -248,4 +288,64 @@ public class CalculateWeeklyBalancesCommandHandler : IRequestHandler<CalculateWe

        return (weekStart, weekEnd);
    }
+
+    /// <summary>
+    /// محاسبه مجموع تعادل‌های زیرمجموعه یک کاربر تا maxLevel لول پایین‌تر
+    /// </summary>
+    private async Task<int> CalculateSubordinateBalancesAsync(
+        long userId,
+        Dictionary<long, NetworkWeeklyBalance> allBalances,
+        int maxLevel,
+        CancellationToken cancellationToken)
+    {
+        // پیدا کردن همه زیرمجموعه‌ها تا maxLevel لول
+        var subordinates = await GetSubordinatesRecursive(userId, 1, maxLevel, cancellationToken);
+
+        // جمع تعادل‌های آنها
+        var totalSubordinateBalances = 0;
+        foreach (var subordinateId in subordinates)
+        {
+            if (allBalances.ContainsKey(subordinateId))
+            {
+                totalSubordinateBalances += allBalances[subordinateId].TotalBalances;
+            }
+        }
+
+        return totalSubordinateBalances;
+    }
+
+    /// <summary>
+    /// پیدا کردن بازگشتی زیرمجموعه‌ها تا maxLevel لول
+    /// </summary>
+    private async Task<List<long>> GetSubordinatesRecursive(
+        long userId,
+        int currentLevel,
+        int maxLevel,
+        CancellationToken cancellationToken)
+    {
+        // محدودیت عمق
+        if (currentLevel > maxLevel)
+        {
+            return new List<long>();
+        }
+
+        var result = new List<long>();
+
+        // پیدا کردن فرزندان مستقیم
+        var children = await _context.Users
+            .Where(x => x.NetworkParentId == userId)
+            .Select(x => x.Id)
+            .ToListAsync(cancellationToken);
+
+        result.AddRange(children);
+
+        // بازگشت برای هر فرزند
+        foreach (var childId in children)
+        {
+            var grandChildren = await GetSubordinatesRecursive(childId, currentLevel + 1, maxLevel, cancellationToken);
+            result.AddRange(grandChildren);
+        }
+
+        return result;
+    }
 }
--- a/src/CMSMicroservice.Application/CommissionCQ/Commands/CalculateWeeklyCommissionPool/CalculateWeeklyCommissionPoolCommandHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Commands/CalculateWeeklyCommissionPool/CalculateWeeklyCommissionPoolCommandHandler.cs
@@ -11,11 +11,19 @@ public class CalculateWeeklyCommissionPoolCommandHandler : IRequestHandler<Calcu

    public async Task<long> Handle(CalculateWeeklyCommissionPoolCommand request, CancellationToken cancellationToken)
    {
-        // بررسی وجود استخر قبلی
+        // بررسی وجود استخر
        var existingPool = await _context.WeeklyCommissionPools
            .FirstOrDefaultAsync(x => x.WeekNumber == request.WeekNumber, cancellationToken);

-        if (existingPool != null && existingPool.IsCalculated && !request.ForceRecalculate)
+        if (existingPool == null)
+        {
+            throw new InvalidOperationException(
+                $"Pool هفته {request.WeekNumber} وجود ندارد. " +
+                "Pool باید در هنگام فعالسازی باشگاه مشتریان ایجاد شده باشد"
+            );
+        }
+
+        if (existingPool.IsCalculated && !request.ForceRecalculate)
        {
            throw new InvalidOperationException($"استخر کمیسیون هفته {request.WeekNumber} قبلاً محاسبه شده است");
        }
@@ -30,48 +38,122 @@ public class CalculateWeeklyCommissionPoolCommandHandler : IRequestHandler<Calcu
            throw new InvalidOperationException($"تعادل‌های هفته {request.WeekNumber} هنوز محاسبه نشده است. ابتدا CalculateWeeklyBalances را اجرا کنید");
        }

-        // محاسبه مجموع مشارکت‌ها در استخر
-        var totalPoolAmount = weeklyBalances.Sum(x => x.WeeklyPoolContribution);
+        // ⭐ Pool از قبل پُر شده (توسط ActivateClubMembership)
+        var totalPoolAmount = existingPool.TotalPoolAmount;

-        // محاسبه مجموع Balances
-        var totalBalances = weeklyBalances.Sum(x => x.TotalBalances);
+        // محاسبه مجموع تعادل‌های کل شبکه
+        // نکته: SubordinateBalances اضافه نمی‌کنیم چون وقتی همه TotalBalances رو جمع می‌زنیم،
+        // خودش شامل بالانس‌های زیرمجموعه‌ها هم هست (تکراری نشه)
+        var totalBalancesInNetwork = weeklyBalances.Sum(x => x.TotalBalances);

-        // محاسبه ارزش هر Balance (تقسیم صحیح برای ریال)
+        // محاسبه ارزش هر امتیاز
        long valuePerBalance = 0;
-        if (totalBalances > 0)
+        if (totalBalancesInNetwork > 0)
        {
-            valuePerBalance = totalPoolAmount / totalBalances;
+            valuePerBalance = totalPoolAmount / totalBalancesInNetwork;
        }

-        if (existingPool != null)
-        {
-            // به‌روزرسانی
-            existingPool.TotalPoolAmount = totalPoolAmount;
-            existingPool.TotalBalances = totalBalances;
-            existingPool.ValuePerBalance = valuePerBalance;
-            existingPool.IsCalculated = true;
-            existingPool.CalculatedAt = DateTime.UtcNow;
+        // به‌روزرسانی Pool
+        existingPool.TotalBalances = totalBalancesInNetwork;
+        existingPool.ValuePerBalance = valuePerBalance;
+        existingPool.IsCalculated = true;
+        existingPool.CalculatedAt = DateTime.Now;

-            _context.WeeklyCommissionPools.Update(existingPool);
-        }
-        else
+        _context.WeeklyCommissionPools.Update(existingPool);
+        await _context.SaveChangesAsync(cancellationToken);
+
+        // حذف پرداخت‌های قبلی در صورت ForceRecalculate
+        if (request.ForceRecalculate)
        {
-            // ایجاد جدید
-            var pool = new WeeklyCommissionPool
+            var oldPayouts = await _context.UserCommissionPayouts
+                .Where(p => p.WeekNumber == request.WeekNumber)
+                .ToListAsync(cancellationToken);
+            
+            if (oldPayouts.Any())
            {
+                var oldPayoutIds = oldPayouts.Select(p => p.Id).ToList();
+                
+                // ⭐ اول باید تاریخچه‌ها حذف بشن (به خاطر FK constraint)
+                var oldHistories = await _context.CommissionPayoutHistories
+                    .Where(h => oldPayoutIds.Contains(h.UserCommissionPayoutId))
+                    .ToListAsync(cancellationToken);
+                
+                if (oldHistories.Any())
+                {
+                    _context.CommissionPayoutHistories.RemoveRange(oldHistories);
+                }
+                
+                // بعد پرداخت‌ها حذف می‌شن
+                _context.UserCommissionPayouts.RemoveRange(oldPayouts);
+                await _context.SaveChangesAsync(cancellationToken);
+            }
+        }
+
+        // ⭐ ثبت پرداخت برای کاربرانی که تعادل دارند
+        // تعادل شخصی + زیرمجموعه قبلاً در CalculateWeeklyBalances محاسبه شده
+        var payouts = new List<UserCommissionPayout>();
+        
+        foreach (var balance in weeklyBalances)
+        {
+            // فقط تعادل شخصی (SubordinateBalances اضافه نمی‌شه چون در SUM کل شبکه خودش حساب میشه)
+            var userBalance = balance.TotalBalances;
+
+            // اگر تعادل صفر است، نیازی به ثبت نیست
+            if (userBalance <= 0)
+            {
+                continue;
+            }
+
+            // محاسبه مبلغ کمیسیون
+            var totalAmount = (long)(userBalance * valuePerBalance);
+
+            var payout = new UserCommissionPayout
+            {
+                UserId = balance.UserId,
                WeekNumber = request.WeekNumber,
-                TotalPoolAmount = totalPoolAmount,
-                TotalBalances = totalBalances,
+                WeeklyPoolId = existingPool.Id,
+                BalancesEarned = userBalance,
                ValuePerBalance = valuePerBalance,
-                IsCalculated = true,
-                CalculatedAt = DateTime.UtcNow
+                TotalAmount = totalAmount,
+                Status = CommissionPayoutStatus.Pending,
+                PaidAt = null,
+                WithdrawalMethod = null,
+                IbanNumber = null,
+                WithdrawnAt = null
            };

-            await _context.WeeklyCommissionPools.AddAsync(pool, cancellationToken);
-            existingPool = pool;
+            payouts.Add(payout);
        }

-        await _context.SaveChangesAsync(cancellationToken);
+        if (payouts.Any())
+        {
+            await _context.UserCommissionPayouts.AddRangeAsync(payouts, cancellationToken);
+            await _context.SaveChangesAsync(cancellationToken);
+
+            // ثبت تاریخچه برای هر پرداخت
+            var historyList = new List<CommissionPayoutHistory>();
+            foreach (var payout in payouts)
+            {
+                var history = new CommissionPayoutHistory
+                {
+                    UserCommissionPayoutId = payout.Id,
+                    UserId = payout.UserId,
+                    WeekNumber = request.WeekNumber,
+                    AmountBefore = 0,
+                    AmountAfter = payout.TotalAmount,
+                    OldStatus = default(CommissionPayoutStatus),
+                    NewStatus = CommissionPayoutStatus.Pending,
+                    Action = CommissionPayoutAction.Created,
+                    PerformedBy = "System",
+                    Reason = "پردازش خودکار کمیسیون هفتگی"
+                };
+
+                historyList.Add(history);
+            }
+
+            await _context.CommissionPayoutHistories.AddRangeAsync(historyList, cancellationToken);
+            await _context.SaveChangesAsync(cancellationToken);
+        }

        return existingPool.Id;
    }
--- a/src/CMSMicroservice.Application/CommissionCQ/Commands/ProcessWithdrawal/ProcessWithdrawalCommandHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Commands/ProcessWithdrawal/ProcessWithdrawalCommandHandler.cs
@@ -39,7 +39,7 @@ public class ProcessWithdrawalCommandHandler : IRequestHandler<ProcessWithdrawal
        }

        var oldStatus = payout.Status;
-        var now = DateTime.UtcNow;
+        var now = DateTime.Now;

        if (request.IsApproved)
        {
--- a/src/CMSMicroservice.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Commands/RejectWithdrawal/RejectWithdrawalCommandHandler.cs
@@ -34,9 +34,9 @@ public class RejectWithdrawalCommandHandler : IRequestHandler<RejectWithdrawalCo
        // Update status to Cancelled (rejected)
        payout.Status = CommissionPayoutStatus.Cancelled;
        payout.ProcessedBy = _currentUser.GetPerformedBy();
-        payout.ProcessedAt = DateTime.UtcNow;
+        payout.ProcessedAt = DateTime.Now;
        payout.RejectionReason = request.Reason;
-        payout.LastModified = DateTime.UtcNow;
+        payout.LastModified = DateTime.Now;

        // TODO: Add PayoutHistory record with rejection reason
        // var history = new CommissionPayoutHistory
@@ -51,7 +51,7 @@ public class RejectWithdrawalCommandHandler : IRequestHandler<RejectWithdrawalCo
        //     Action = (int)CommissionPayoutAction.Rejected,
        //     PerformedBy = "Admin", // TODO: Get from authenticated user
        //     Reason = request.Reason,
-        //     Created = DateTime.UtcNow
+        //     Created = DateTime.Now
        // };
        // _context.CommissionPayoutHistories.Add(history);

--- a/src/CMSMicroservice.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommand.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommand.cs
@@ -13,17 +13,12 @@ public record TriggerWeeklyCalculationCommand : IRequest<TriggerWeeklyCalculatio
    public bool ForceRecalculate { get; init; }

    /// <summary>
-    /// Skip balance calculation
+    /// Skip balance calculation (Step 1)
    /// </summary>
    public bool SkipBalances { get; init; }

    /// <summary>
-    /// Skip pool calculation
-    /// </summary>
-    public bool SkipPool { get; init; }
-
-    /// <summary>
-    /// Skip payout processing
+    /// Skip pool calculation and payout processing (Step 2)
    /// </summary>
    public bool SkipPayouts { get; init; }
 }
--- a/src/CMSMicroservice.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Commands/TriggerWeeklyCalculation/TriggerWeeklyCalculationCommandHandler.cs
@@ -1,7 +1,6 @@
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Application.CommissionCQ.Commands.CalculateWeeklyBalances;
 using CMSMicroservice.Application.CommissionCQ.Commands.CalculateWeeklyCommissionPool;
-using CMSMicroservice.Application.CommissionCQ.Commands.ProcessUserPayouts;

 namespace CMSMicroservice.Application.CommissionCQ.Commands.TriggerWeeklyCalculation;

@@ -23,7 +22,7 @@ public class TriggerWeeklyCalculationCommandHandler : IRequestHandler<TriggerWee
        CancellationToken cancellationToken)
    {
        var executionId = Guid.NewGuid().ToString();
-        var startedAt = DateTime.UtcNow;
+        var startedAt = DateTime.Now;

        try
        {
@@ -41,7 +40,7 @@ public class TriggerWeeklyCalculationCommandHandler : IRequestHandler<TriggerWee

            var steps = new List<string>();

-            // Step 1: Calculate Weekly Balances
+            // Step 1: Calculate Weekly Balances (تا 15 لول)
            if (!request.SkipBalances)
            {
                await _mediator.Send(new CalculateWeeklyBalancesCommand
@@ -52,25 +51,15 @@ public class TriggerWeeklyCalculationCommandHandler : IRequestHandler<TriggerWee
                steps.Add("محاسبه امتیازات هفتگی");
            }

-            // Step 2: Calculate Weekly Commission Pool
-            if (!request.SkipPool)
+            // Step 2: Calculate Pool & Process Payouts (محاسبه استخر + پرداخت کاربران)
+            if (!request.SkipPayouts)
            {
                await _mediator.Send(new CalculateWeeklyCommissionPoolCommand
-                {
-                    WeekNumber = request.WeekNumber
-                }, cancellationToken);
-                steps.Add("محاسبه استخر کمیسیون");
-            }
-
-            // Step 3: Process User Payouts
-            if (!request.SkipPayouts)
-            {
-                await _mediator.Send(new ProcessUserPayoutsCommand
                {
                    WeekNumber = request.WeekNumber,
-                    ForceReprocess = request.ForceRecalculate
+                    ForceRecalculate = request.ForceRecalculate
                }, cancellationToken);
-                steps.Add("پردازش پرداخت‌های کاربران");
+                steps.Add("محاسبه استخر و پرداخت کاربران");
            }

            return new TriggerWeeklyCalculationResponseDto
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQuery.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQuery.cs
@@ -0,0 +1,13 @@
+namespace CMSMicroservice.Application.CommissionCQ.Queries.GetAvailableWeeks;
+
+/// <summary>
+/// دریافت لیست هفته‌های قابل انتخاب برای محاسبه کمیسیون
+/// </summary>
+public class GetAvailableWeeksQuery : IRequest<GetAvailableWeeksResponseDto>
+{
+    /// <summary>تعداد هفته‌های آینده برای نمایش (پیش‌فرض: 4)</summary>
+    public int FutureWeeksCount { get; init; } = 4;
+    
+    /// <summary>تعداد هفته‌های گذشته برای نمایش (پیش‌فرض: 12)</summary>
+    public int PastWeeksCount { get; init; } = 12;
+}
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksQueryHandler.cs
@@ -0,0 +1,132 @@
+using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Domain.Enums;
+using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+
+namespace CMSMicroservice.Application.CommissionCQ.Queries.GetAvailableWeeks;
+
+public class GetAvailableWeeksQueryHandler : IRequestHandler<GetAvailableWeeksQuery, GetAvailableWeeksResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetAvailableWeeksQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetAvailableWeeksResponseDto> Handle(
+        GetAvailableWeeksQuery request, 
+        CancellationToken cancellationToken)
+    {
+        var currentDate = DateTime.Now;
+        var currentWeekNumber = GetWeekNumber(currentDate);
+        
+        // دریافت هفته‌های محاسبه شده از دیتابیس
+        var calculatedPools = await _context.WeeklyCommissionPools
+            .Where(p => p.IsCalculated)
+            .OrderByDescending(p => p.WeekNumber)
+            .Take(request.PastWeeksCount)
+            .ToListAsync(cancellationToken);
+
+        // دریافت لاگ‌های اجرا
+        var executionLogs = await _context.WorkerExecutionLogs
+            .Where(log => log.Status == WorkerExecutionStatus.Success || 
+                          log.Status == WorkerExecutionStatus.Failed)
+            .GroupBy(log => log.WeekNumber)
+            .Select(g => new 
+            { 
+                WeekNumber = g.Key, 
+                LastLog = g.OrderByDescending(l => l.StartedAt).First()
+            })
+            .ToDictionaryAsync(x => x.WeekNumber, x => x.LastLog, cancellationToken);
+
+        var allWeeks = new List<WeekInfoDto>();
+        
+        // هفته جاری
+        var currentWeekInfo = CreateWeekInfo(currentDate, currentWeekNumber, calculatedPools, executionLogs);
+        
+        // هفته‌های گذشته (12 هفته)
+        var pastWeeks = new List<WeekInfoDto>();
+        for (int i = 1; i <= request.PastWeeksCount; i++)
+        {
+            var pastDate = currentDate.AddDays(-7 * i);
+            var weekNumber = GetWeekNumber(pastDate);
+            pastWeeks.Add(CreateWeekInfo(pastDate, weekNumber, calculatedPools, executionLogs));
+        }
+        
+        // هفته‌های آینده (4 هفته)
+        var futureWeeks = new List<WeekInfoDto>();
+        for (int i = 1; i <= request.FutureWeeksCount; i++)
+        {
+            var futureDate = currentDate.AddDays(7 * i);
+            var weekNumber = GetWeekNumber(futureDate);
+            futureWeeks.Add(CreateWeekInfo(futureDate, weekNumber, calculatedPools, executionLogs));
+        }
+        
+        // تفکیک به calculated و pending
+        var calculatedWeeks = pastWeeks.Where(w => w.IsCalculated).ToList();
+        var pendingWeeks = pastWeeks.Where(w => !w.IsCalculated).ToList();
+        
+        return new GetAvailableWeeksResponseDto
+        {
+            CurrentWeek = currentWeekInfo,
+            CalculatedWeeks = calculatedWeeks,
+            PendingWeeks = pendingWeeks,
+            FutureWeeks = futureWeeks
+        };
+    }
+
+    private WeekInfoDto CreateWeekInfo(
+        DateTime date, 
+        string weekNumber,
+        List<Domain.Entities.Commission.WeeklyCommissionPool> calculatedPools,
+        Dictionary<string, Domain.Entities.Commission.WorkerExecutionLog> executionLogs)
+    {
+        var (startDate, endDate) = GetWeekRange(date);
+        var pool = calculatedPools.FirstOrDefault(p => p.WeekNumber == weekNumber);
+        var log = executionLogs.GetValueOrDefault(weekNumber);
+        
+        var isCalculated = pool != null && pool.IsCalculated;
+        var displayText = $"{weekNumber} ({startDate:yyyy/MM/dd} - {endDate:yyyy/MM/dd})";
+        
+        if (isCalculated)
+        {
+            displayText += " ✅ محاسبه شده";
+        }
+        
+        return new WeekInfoDto
+        {
+            WeekNumber = weekNumber,
+            StartDate = startDate,
+            EndDate = endDate,
+            IsCalculated = isCalculated,
+            CalculatedAt = pool?.CalculatedAt,
+            LastExecutionStatus = log?.Status.ToString(),
+            TotalPoolAmount = pool?.TotalPoolAmount,
+            EligibleUsersCount = pool?.UserCommissionPayouts?.Count ?? 0,
+            DisplayText = displayText
+        };
+    }
+
+    private static string GetWeekNumber(DateTime date)
+    {
+        var calendar = CultureInfo.InvariantCulture.Calendar;
+        var weekOfYear = calendar.GetWeekOfYear(
+            date, 
+            CalendarWeekRule.FirstFourDayWeek, 
+            DayOfWeek.Monday);
+        
+        return $"{date.Year}-W{weekOfYear:D2}";
+    }
+
+    private static (DateTime startDate, DateTime endDate) GetWeekRange(DateTime date)
+    {
+        var dayOfWeek = (int)date.DayOfWeek;
+        var daysToMonday = dayOfWeek == 0 ? 6 : dayOfWeek - 1; // اگر یکشنبه باشد، 6 روز عقب برو
+        
+        var startDate = date.Date.AddDays(-daysToMonday);
+        var endDate = startDate.AddDays(6);
+        
+        return (startDate, endDate);
+    }
+}
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksResponseDto.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetAvailableWeeks/GetAvailableWeeksResponseDto.cs
@@ -0,0 +1,46 @@
+namespace CMSMicroservice.Application.CommissionCQ.Queries.GetAvailableWeeks;
+
+public class GetAvailableWeeksResponseDto
+{
+    /// <summary>هفته جاری</summary>
+    public required WeekInfoDto CurrentWeek { get; init; }
+    
+    /// <summary>هفته‌های محاسبه شده (از جدیدترین به قدیمی‌ترین)</summary>
+    public required List<WeekInfoDto> CalculatedWeeks { get; init; }
+    
+    /// <summary>هفته‌های محاسبه نشده (از جدیدترین به قدیمی‌ترین)</summary>
+    public required List<WeekInfoDto> PendingWeeks { get; init; }
+    
+    /// <summary>هفته‌های آینده قابل انتخاب</summary>
+    public required List<WeekInfoDto> FutureWeeks { get; init; }
+}
+
+public class WeekInfoDto
+{
+    /// <summary>شماره هفته (YYYY-Www)</summary>
+    public required string WeekNumber { get; init; }
+    
+    /// <summary>تاریخ شروع هفته</summary>
+    public required DateTime StartDate { get; init; }
+    
+    /// <summary>تاریخ پایان هفته</summary>
+    public required DateTime EndDate { get; init; }
+    
+    /// <summary>آیا محاسبه شده؟</summary>
+    public bool IsCalculated { get; init; }
+    
+    /// <summary>تاریخ محاسبه (اگر محاسبه شده باشد)</summary>
+    public DateTime? CalculatedAt { get; init; }
+    
+    /// <summary>وضعیت اجرای آخرین محاسبه</summary>
+    public string? LastExecutionStatus { get; init; }
+    
+    /// <summary>مبلغ کل استخر کمیسیون (اگر محاسبه شده باشد)</summary>
+    public long? TotalPoolAmount { get; init; }
+    
+    /// <summary>تعداد کاربران واجد شرایط</summary>
+    public int? EligibleUsersCount { get; init; }
+    
+    /// <summary>نمایش فارسی (برای UI)</summary>
+    public required string DisplayText { get; init; }
+}
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetWithdrawalReports/GetWithdrawalReportsQueryHandler.cs
@@ -19,7 +19,7 @@ public class GetWithdrawalReportsQueryHandler : IRequestHandler<GetWithdrawalRep
    public async Task<WithdrawalReportsDto> Handle(GetWithdrawalReportsQuery request, CancellationToken cancellationToken)
    {
        // تعیین بازه زمانی پیش‌فرض (30 روز گذشته)
-        var endDate = request.EndDate ?? DateTime.UtcNow;
+        var endDate = request.EndDate ?? DateTime.Now;
        var startDate = request.StartDate ?? endDate.AddDays(-30);

        // Query پایه
--- a/src/CMSMicroservice.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs
+++ b/src/CMSMicroservice.Application/CommissionCQ/Queries/GetWorkerStatus/GetWorkerStatusQueryHandler.cs
@@ -27,8 +27,8 @@ public class GetWorkerStatusQueryHandler : IRequestHandler<GetWorkerStatusQuery,
            CurrentExecutionId = null,
            CurrentWeekNumber = null,
            CurrentStep = "Idle",
-            LastRunAt = DateTime.UtcNow.AddHours(-24),
-            NextScheduledRun = DateTime.UtcNow.AddDays(7),
+            LastRunAt = DateTime.Now.AddHours(-24),
+            NextScheduledRun = DateTime.Now.AddDays(7),
            TotalExecutions = 48,
            SuccessfulExecutions = 47,
            FailedExecutions = 1
--- a/src/CMSMicroservice.Application/DayaLoanCQ/Commands/CheckDayaLoanStatus/CheckDayaLoanStatusCommandHandler.cs
+++ b/src/CMSMicroservice.Application/DayaLoanCQ/Commands/CheckDayaLoanStatus/CheckDayaLoanStatusCommandHandler.cs
@@ -48,7 +48,7 @@ public class CheckDayaLoanStatusCommandHandler : IRequestHandler<CheckDayaLoanSt
                    
                    if (existingContract != null)
                    {
-                        existingContract.LastCheckDate = DateTime.UtcNow;
+                        existingContract.LastCheckDate = DateTime.Now;
                        existingContract.Status = dayaResult.Status;
                        existingContract.ContractNumber = dayaResult.ContractNumber;
                    }
@@ -65,7 +65,7 @@ public class CheckDayaLoanStatusCommandHandler : IRequestHandler<CheckDayaLoanSt
                                NationalCode = dayaResult.NationalCode,
                                Status = dayaResult.Status,
                                ContractNumber = dayaResult.ContractNumber,
-                                LastCheckDate = DateTime.UtcNow,
+                                LastCheckDate = DateTime.Now,
                                IsProcessed = false
                            };
                            
--- a/src/CMSMicroservice.Application/DayaLoanCQ/Commands/ProcessDayaLoanApproval/ProcessDayaLoanApprovalCommandHandler.cs
+++ b/src/CMSMicroservice.Application/DayaLoanCQ/Commands/ProcessDayaLoanApproval/ProcessDayaLoanApprovalCommandHandler.cs
@@ -36,7 +36,7 @@ public class ProcessDayaLoanApprovalCommandHandler : IRequestHandler<ProcessDaya
            Amount = request.WalletAmount + request.LockedWalletAmount + request.DiscountWalletAmount, // 168 میلیون
            Description = $"دریافت اعتبار دایا - قرارداد {request.ContractNumber}",
            PaymentStatus = PaymentStatus.Success,
-            PaymentDate = DateTime.UtcNow,
+            PaymentDate = DateTime.Now,
            RefId = request.ContractNumber, // شماره قرارداد دایا
            Type = TransactionType.DepositExternal1
        };
@@ -114,7 +114,7 @@ public class ProcessDayaLoanApprovalCommandHandler : IRequestHandler<ProcessDaya
        
        // به‌روزرسانی وضعیت کاربر
        user.HasReceivedDayaCredit = true;
-        user.DayaCreditReceivedAt = DateTime.UtcNow;
+        user.DayaCreditReceivedAt = DateTime.Now;
        
        // تنظیم نحوه خرید پکیج به DayaLoan
        user.PackagePurchaseMethod = PackagePurchaseMethod.DayaLoan;
@@ -139,7 +139,7 @@ public class ProcessDayaLoanApprovalCommandHandler : IRequestHandler<ProcessDaya
                    PackageId = goldenPackage.Id,
                    Amount = request.WalletAmount, // 56 میلیون
                    PaymentStatus = PaymentStatus.Success,
-                    PaymentDate = DateTime.UtcNow,
+                    PaymentDate = DateTime.Now,
                    DeliveryStatus = DeliveryStatus.None,
                    UserAddressId = defaultAddress.Id,
                    TransactionId = transaction.Id,
--- a/src/CMSMicroservice.Application/DiscountShopCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs
+++ b/src/CMSMicroservice.Application/DiscountShopCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs
@@ -46,12 +46,12 @@ public class CompleteOrderPaymentCommandHandler : IRequestHandler<CompleteOrderP
        {
            // Update transaction
            transaction.PaymentStatus = PaymentStatus.Success;
-            transaction.PaymentDate = DateTime.UtcNow;
+            transaction.PaymentDate = DateTime.Now;
            transaction.RefId = request.RefId;

            // Update order
            order.PaymentStatus = PaymentStatus.Success;
-            order.PaymentDate = DateTime.UtcNow;
+            order.PaymentDate = DateTime.Now;
            order.DeliveryStatus = DeliveryStatus.InTransit;

            // Deduct discount balance from user wallet
--- a/src/CMSMicroservice.Application/DiscountShopCQ/Commands/CreateDiscountCategory/CreateDiscountCategoryCommandHandler.cs
+++ b/src/CMSMicroservice.Application/DiscountShopCQ/Commands/CreateDiscountCategory/CreateDiscountCategoryCommandHandler.cs
@@ -47,7 +47,7 @@ public class CreateDiscountCategoryCommandHandler : IRequestHandler<CreateDiscou
            ParentCategoryId = request.ParentCategoryId,
            SortOrder = request.SortOrder,
            IsActive = request.IsActive,
-            Created = DateTime.UtcNow
+            Created = DateTime.Now
        };

        _context.DiscountCategories.Add(category);
--- a/src/CMSMicroservice.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandHandler.cs
+++ b/src/CMSMicroservice.Application/ManualPaymentCQ/Commands/ApproveManualPayment/ApproveManualPaymentCommandHandler.cs
@@ -86,7 +86,7 @@ public class ApproveManualPaymentCommandHandler : IRequestHandler<ApproveManualP
                Amount = manualPayment.Amount,
                Description = $"پرداخت دستی - {manualPayment.Type} - {manualPayment.Description}",
                PaymentStatus = PaymentStatus.Success,
-                PaymentDate = DateTime.UtcNow,
+                PaymentDate = DateTime.Now,
                RefId = manualPayment.ReferenceNumber,
                Type = MapToTransactionType(manualPayment.Type)
            };
@@ -219,7 +219,7 @@ public class ApproveManualPaymentCommandHandler : IRequestHandler<ApproveManualP
            // 7. به‌روزرسانی ManualPayment
            manualPayment.Status = ManualPaymentStatus.Approved;
            manualPayment.ApprovedBy = approvedById;
-            manualPayment.ApprovedAt = DateTime.UtcNow;
+            manualPayment.ApprovedAt = DateTime.Now;
            manualPayment.TransactionId = transaction.Id;

            await _context.SaveChangesAsync(cancellationToken);
--- a/src/CMSMicroservice.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandHandler.cs
+++ b/src/CMSMicroservice.Application/ManualPaymentCQ/Commands/RejectManualPayment/RejectManualPaymentCommandHandler.cs
@@ -71,7 +71,7 @@ public class RejectManualPaymentCommandHandler : IRequestHandler<RejectManualPay
            // 4. رد درخواست
            manualPayment.Status = ManualPaymentStatus.Rejected;
            manualPayment.ApprovedBy = rejectedById;
-            manualPayment.ApprovedAt = DateTime.UtcNow;
+            manualPayment.ApprovedAt = DateTime.Now;
            manualPayment.RejectionReason = request.RejectionReason;

            await _context.SaveChangesAsync(cancellationToken);
--- a/src/CMSMicroservice.Application/NetworkMembershipCQ/Queries/GetNetworkStatistics/GetNetworkStatisticsQueryHandler.cs
+++ b/src/CMSMicroservice.Application/NetworkMembershipCQ/Queries/GetNetworkStatistics/GetNetworkStatisticsQueryHandler.cs
@@ -55,7 +55,7 @@ public class GetNetworkStatisticsQueryHandler : IRequestHandler<GetNetworkStatis
        }

        // Monthly growth (last 6 months) - using Created date
-        var sixMonthsAgo = DateTime.UtcNow.AddMonths(-6);
+        var sixMonthsAgo = DateTime.Now.AddMonths(-6);
        var monthlyGrowth = await _context.Users
            .Where(x => x.NetworkParentId != null && x.Created >= sixMonthsAgo)
            .GroupBy(x => new { x.Created.Year, x.Created.Month })
--- a/src/CMSMicroservice.Application/PackageCQ/Commands/VerifyGoldenPackagePurchase/VerifyGoldenPackagePurchaseCommandHandler.cs
+++ b/src/CMSMicroservice.Application/PackageCQ/Commands/VerifyGoldenPackagePurchase/VerifyGoldenPackagePurchaseCommandHandler.cs
@@ -125,7 +125,7 @@ public class VerifyGoldenPackagePurchaseCommandHandler : IRequestHandler<VerifyG
                Amount = order.Amount,
                Description = $"خرید پکیج طلایی از درگاه - سفارش #{order.Id}",
                PaymentStatus = PaymentStatus.Success,
-                PaymentDate = DateTime.UtcNow,
+                PaymentDate = DateTime.Now,
                RefId = verifyResult.RefId,
                Type = TransactionType.DepositIpg
            };
@@ -152,7 +152,7 @@ public class VerifyGoldenPackagePurchaseCommandHandler : IRequestHandler<VerifyG
            // 7. به‌روزرسانی سفارش و کاربر
            order.TransactionId = transaction.Id;
            order.PaymentStatus = PaymentStatus.Success;
-            order.PaymentDate = DateTime.UtcNow;
+            order.PaymentDate = DateTime.Now;
            order.PaymentMethod = PaymentMethod.IPG;
            order.User.PackagePurchaseMethod = PackagePurchaseMethod.DirectPurchase;

--- a/src/CMSMicroservice.Application/PackageCQ/Commands/VerifyPackagePurchase/VerifyPackagePurchaseCommandHandler.cs
+++ b/src/CMSMicroservice.Application/PackageCQ/Commands/VerifyPackagePurchase/VerifyPackagePurchaseCommandHandler.cs
@@ -116,7 +116,7 @@ public class VerifyPackagePurchaseCommandHandler
                Amount = order.Amount,
                Description = $"خرید پکیج از درگاه - سفارش #{order.Id}",
                PaymentStatus = PaymentStatus.Success,
-                PaymentDate = DateTime.UtcNow,
+                PaymentDate = DateTime.Now,
                RefId = verifyResult.RefId,
                Type = TransactionType.DepositIpg
            };
@@ -157,7 +157,7 @@ public class VerifyPackagePurchaseCommandHandler
            // 8. به‌روزرسانی Order
            order.TransactionId = transaction.Id;
            order.PaymentStatus = PaymentStatus.Success;
-            order.PaymentDate = DateTime.UtcNow;
+            order.PaymentDate = DateTime.Now;
            order.PaymentMethod = PaymentMethod.IPG;

            // 9. تغییر User.PackagePurchaseMethod
--- a/src/CMSMicroservice.Application/PublicMessageCQ/Commands/ArchiveMessage/ArchiveMessageCommandHandler.cs
+++ b/src/CMSMicroservice.Application/PublicMessageCQ/Commands/ArchiveMessage/ArchiveMessageCommandHandler.cs
@@ -31,7 +31,7 @@ public class ArchiveMessageCommandHandler : IRequestHandler<ArchiveMessageComman
        // 3. آرشیو کردن:
        //    - message.IsArchived = true
        //    - message.IsActive = false  // غیرفعال هم می‌شود
-        //    - message.ArchivedAt = DateTime.UtcNow
+        //    - message.ArchivedAt = DateTime.Now
        //
        // 4. ذخیره و Log:
        //    - await _context.SaveChangesAsync(cancellationToken)
--- a/src/CMSMicroservice.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommandValidator.cs
+++ b/src/CMSMicroservice.Application/PublicMessageCQ/Commands/CreatePublicMessage/CreatePublicMessageCommandValidator.cs
@@ -26,7 +26,7 @@ public class CreatePublicMessageCommandValidator : AbstractValidator<CreatePubli

        RuleFor(x => x.ExpiresAt)
            .NotEmpty().WithMessage("تاریخ پایان الزامی است")
-            .GreaterThan(DateTime.UtcNow).WithMessage("تاریخ پایان باید در آینده باشد");
+            .GreaterThan(DateTime.Now).WithMessage("تاریخ پایان باید در آینده باشد");

        RuleFor(x => x.LinkUrl)
            .MaximumLength(500).WithMessage("لینک نمی‌تواند بیشتر از 500 کاراکتر باشد")
--- a/src/CMSMicroservice.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommandHandler.cs
+++ b/src/CMSMicroservice.Application/PublicMessageCQ/Commands/PublishMessage/PublishMessageCommandHandler.cs
@@ -33,10 +33,10 @@ public class PublishMessageCommandHandler : IRequestHandler<PublishMessageComman
        //
        // 3. فعال‌سازی پیام:
        //    - message.IsActive = true
-        //    - message.PublishedAt = DateTime.UtcNow
+        //    - message.PublishedAt = DateTime.Now
        //    - اگر StartDate خالی است، از الان شروع کن:
        //      if (!message.StartDate.HasValue)
-        //        message.StartDate = DateTime.UtcNow
+        //        message.StartDate = DateTime.Now
        //
        // 4. ذخیره و Log:
        //    - await _context.SaveChangesAsync(cancellationToken)
--- a/src/CMSMicroservice.Application/PublicMessageCQ/Queries/GetActiveMessages/GetActiveMessagesQueryHandler.cs
+++ b/src/CMSMicroservice.Application/PublicMessageCQ/Queries/GetActiveMessages/GetActiveMessagesQueryHandler.cs
@@ -21,7 +21,7 @@ public class GetActiveMessagesQueryHandler : IRequestHandler<GetActiveMessagesQu

    public async Task<List<PublicMessageDto>> Handle(GetActiveMessagesQuery request, CancellationToken cancellationToken)
    {
-        var now = DateTime.UtcNow;
+        var now = DateTime.Now;

        var query = _context.PublicMessages
            .Where(x => !x.IsDeleted 
--- a/src/CMSMicroservice.Application/PublicMessageCQ/Queries/GetAllMessages/GetAllMessagesQueryHandler.cs
+++ b/src/CMSMicroservice.Application/PublicMessageCQ/Queries/GetAllMessages/GetAllMessagesQueryHandler.cs
@@ -22,7 +22,7 @@ public class GetAllMessagesQueryHandler : IRequestHandler<GetAllMessagesQuery, G

    public async Task<GetAllMessagesResponseDto> Handle(GetAllMessagesQuery request, CancellationToken cancellationToken)
    {
-        var now = DateTime.UtcNow;
+        var now = DateTime.Now;

        // Query پایه
        var query = _context.PublicMessages
--- a/src/CMSMicroservice.Application/TransactionsCQ/Commands/RefundTransaction/RefundTransactionCommandHandler.cs
+++ b/src/CMSMicroservice.Application/TransactionsCQ/Commands/RefundTransaction/RefundTransactionCommandHandler.cs
@@ -43,7 +43,7 @@ public class RefundTransactionCommandHandler : IRequestHandler<RefundTransaction
            Amount = -refundAmount, // مبلغ منفی برای استرداد
            Description = $"استرداد تراکنش {request.TransactionId}: {request.RefundReason}",
            PaymentStatus = PaymentStatus.Success,
-            PaymentDate = DateTime.UtcNow,
+            PaymentDate = DateTime.Now,
            RefId = $"REFUND-{originalTransaction.RefId}",
            Type = TransactionType.Buy // یا می‌تونیم یک نوع جدید برای Refund تعریف کنیم
        };
--- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandHandler.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/ApplyDiscountToOrder/ApplyDiscountToOrderCommandHandler.cs
@@ -49,7 +49,7 @@ public class ApplyDiscountToOrderCommandHandler : IRequestHandler<ApplyDiscountT
        //        DiscountAmount = request.DiscountAmount,
        //        Reason = request.Reason,
        //        DiscountCode = request.DiscountCode,
-        //        AppliedAt = DateTime.UtcNow
+        //        AppliedAt = DateTime.Now
        //      }
        //    - await _context.OrderDiscountLogs.AddAsync(discountLog, cancellationToken)
        //
--- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandHandler.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/CancelOrder/CancelOrderCommandHandler.cs
@@ -50,7 +50,7 @@ public class CancelOrderCommandHandler : IRequestHandler<CancelOrderCommand, Can
                Amount = -order.Amount,
                Description = $"بازگشت وجه سفارش {request.OrderId}: {request.CancelReason}",
                PaymentStatus = PaymentStatus.Success,
-                PaymentDate = DateTime.UtcNow,
+                PaymentDate = DateTime.Now,
                RefId = $"REFUND-ORDER-{order.Id}",
                Type = TransactionType.Buy
            };
--- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs
@@ -147,7 +147,7 @@ public class
                VATAmount = vatAmount,
                TotalAmount = totalAmount,
                IsPaid = true,
-                PaidAt = DateTime.UtcNow
+                PaidAt = DateTime.Now
            };

            await _context.OrderVATs.AddAsync(orderVAT, cancellationToken);
--- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryValidator.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetOrdersByDateRange/GetOrdersByDateRangeQueryValidator.cs
@@ -9,7 +9,7 @@ public class GetOrdersByDateRangeQueryValidator : AbstractValidator<GetOrdersByD
            .WithMessage("تاریخ شروع باید کوچکتر یا مساوی تاریخ پایان باشد");

        RuleFor(x => x.EndDate)
-            .LessThanOrEqualTo(DateTime.UtcNow.AddDays(1))
+            .LessThanOrEqualTo(DateTime.Now.AddDays(1))
            .WithMessage("تاریخ پایان نمی‌تواند در آینده باشد");

        RuleFor(x => x.PageIndex)
--- a/src/CMSMicroservice.Application/WalletCQ/Commands/VerifyDiscountWalletCharge/VerifyDiscountWalletChargeCommandHandler.cs
+++ b/src/CMSMicroservice.Application/WalletCQ/Commands/VerifyDiscountWalletCharge/VerifyDiscountWalletChargeCommandHandler.cs
@@ -92,7 +92,7 @@ public class VerifyDiscountWalletChargeCommandHandler
                Amount = request.Amount,
                Description = $"شارژ کیف پول تخفیفی - کاربر {user.Id}",
                PaymentStatus = PaymentStatus.Success,
-                PaymentDate = DateTime.UtcNow,
+                PaymentDate = DateTime.Now,
                RefId = verifyResult.RefId,
                Type = TransactionType.DiscountWalletCharge
            };