diff --git a/src/CMSMicroservice.Application/Common/Mappings/UserOrderProfile.cs b/src/CMSMicroservice.Application/Common/Mappings/UserOrderProfile.cs
index a56c965..6940d65 100644
--- a/src/CMSMicroservice.Application/Common/Mappings/UserOrderProfile.cs
+++ b/src/CMSMicroservice.Application/Common/Mappings/UserOrderProfile.cs
@@ -1,10 +1,58 @@
+using CMSMicroservice.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter;
+using CMSMicroservice.Application.UserOrderCQ.Queries.GetUserOrder;
+
 namespace CMSMicroservice.Application.Common.Mappings;
 
 public class UserOrderProfile : IRegister
 {
     void IRegister.Register(TypeAdapterConfig config)
     {
-        // config.NewConfig<Source,Destination>()
-        //     .Map(dest => dest.FullName, src => $"{src.Firstname} {src.Lastname}");
+        config.NewConfig<UserOrder,GetUserOrderResponseDto>()
+            .Map(dest => dest.Id, src => src.Id)
+            .Map(dest => dest.Amount, src => src.Amount)
+            .Map(dest => dest.PackageId, src => src.PackageId)
+            .Map(dest => dest.TransactionId, src => src.TransactionId)
+            .Map(dest => dest.PaymentStatus, src => src.PaymentStatus)
+            .Map(dest => dest.PaymentDate, src => src.PaymentDate)
+            .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.UserAddressId, src => src.UserAddressId)
+            .Map(dest => dest.PaymentMethod, src => src.PaymentMethod)
+            .Map(dest => dest.UserAddressText, src => src.UserAddress.Address)
+            .Map(dest => dest.FactorDetails, src => src.FactorDetailss.Select(s=>s.Adapt<GetUserOrderResponseFactorDetail>()))
+        
+            ; 
+        
+        config.NewConfig<UserOrder,GetAllUserOrderByFilterResponseModel>()
+            .Map(dest => dest.Id, src => src.Id)
+            .Map(dest => dest.Amount, src => src.Amount)
+            .Map(dest => dest.PackageId, src => src.PackageId)
+            .Map(dest => dest.TransactionId, src => src.TransactionId)
+            .Map(dest => dest.PaymentStatus, src => src.PaymentStatus)
+            .Map(dest => dest.PaymentDate, src => src.PaymentDate)
+            .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.UserAddressId, src => src.UserAddressId)
+            .Map(dest => dest.PaymentMethod, src => src.PaymentMethod)
+            .Map(dest => dest.UserAddressText, src => src.UserAddress.Address)
+            .Map(dest => dest.FactorDetails, src => src.FactorDetailss.Select(s=>s.Adapt<GetUserOrderResponseFactorDetail>()))
+            ;
+        
+        config.NewConfig<FactorDetails,GetUserOrderResponseFactorDetail>()
+            .Map(dest => dest.ProductId, src => src.ProductId)
+            .Map(dest => dest.ProductTitle, src => src.Product.Title)
+            .Map(dest => dest.ProductThumbnailPath, src => src.Product.ThumbnailPath)
+            .Map(dest => dest.UnitPrice, src => src.Product.Price)
+            .Map(dest => dest.Count, src => src.Count)
+            .Map(dest => dest.UnitDiscountPrice, src => src.Product.Price*(src.Product.Discount/100))
+            ;    
+        
+        config.NewConfig<FactorDetails,GetAllUserOrderByFilterResponseModelFactorDetail>()
+            .Map(dest => dest.ProductId, src => src.ProductId)
+            .Map(dest => dest.ProductTitle, src => src.Product.Title)
+            .Map(dest => dest.ProductThumbnailPath, src => src.Product.ThumbnailPath)
+            .Map(dest => dest.UnitPrice, src => src.Product.Price)
+            .Map(dest => dest.Count, src => src.Count)
+            .Map(dest => dest.UnitDiscountPrice, src => src.Product.Price*(src.Product.Discount/100))
+            ;
+        
     }
 }
diff --git a/src/CMSMicroservice.Application/OtpTokenCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs b/src/CMSMicroservice.Application/OtpTokenCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs
index 10e7a61..99c1161 100644
--- a/src/CMSMicroservice.Application/OtpTokenCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs
+++ b/src/CMSMicroservice.Application/OtpTokenCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs
@@ -1,6 +1,8 @@
 using CMSMicroservice.Domain.Events;
 using Microsoft.Extensions.Configuration;
+
 namespace CMSMicroservice.Application.OtpTokenCQ.Commands.VerifyOtpToken;
+
 public class VerifyOtpTokenCommandHandler : IRequestHandler<VerifyOtpTokenCommand, VerifyOtpTokenResponseDto>
 {
     private readonly IApplicationDbContext _context;
@@ -14,8 +16,10 @@ public class VerifyOtpTokenCommandHandler : IRequestHandler<VerifyOtpTokenComman
         _hashService = hashService;
     }
 
-    const int MaxAttempts = 5;              // محدودیت تلاش    
-    public async Task<VerifyOtpTokenResponseDto> Handle(VerifyOtpTokenCommand request, CancellationToken cancellationToken)
+    const int MaxAttempts = 5; // محدودیت تلاش    
+
+    public async Task<VerifyOtpTokenResponseDto> Handle(VerifyOtpTokenCommand request,
+        CancellationToken cancellationToken)
     {
         var mobile = request.Mobile.NormalizeIranMobile();
         var purpose = request.Purpose?.ToLowerInvariant() ?? "signup";
@@ -26,9 +30,12 @@ public class VerifyOtpTokenCommandHandler : IRequestHandler<VerifyOtpTokenComman
             .OrderByDescending(o => o.Created)
             .FirstOrDefaultAsync(cancellationToken);
 
-        if (otp is null) return new VerifyOtpTokenResponseDto() { Success = false, Message = "کد پیدا نشد یا منقضی شده است." };
+        if (otp is null)
+            return new VerifyOtpTokenResponseDto() { Success = false, Message = "کد پیدا نشد یا منقضی شده است." };
 
-        if (otp.Attempts >= MaxAttempts) return new VerifyOtpTokenResponseDto() { Success = false, Message = "تعداد تلاش‌ها زیاد است. دوباره کد بگیرید." };
+        if (otp.Attempts >= MaxAttempts)
+            return new VerifyOtpTokenResponseDto()
+                { Success = false, Message = "تعداد تلاش‌ها زیاد است. دوباره کد بگیرید." };
 
         otp.Attempts++;
 
@@ -50,7 +57,8 @@ public class VerifyOtpTokenCommandHandler : IRequestHandler<VerifyOtpTokenComman
             if (request.ParentReferralCode == null)
                 return new VerifyOtpTokenResponseDto() { Success = false, Message = "کد معرف الزامی است." };
 
-            var parent = await _context.Users.FirstOrDefaultAsync(u => u.ReferralCode == request.ParentReferralCode, cancellationToken: cancellationToken);
+            var parent = await _context.Users.FirstOrDefaultAsync(u => u.ReferralCode == request.ParentReferralCode,
+                cancellationToken: cancellationToken);
             if (parent == null)
                 return new VerifyOtpTokenResponseDto() { Success = false, Message = "معرف وجود ندارد." };
 
@@ -70,13 +78,24 @@ public class VerifyOtpTokenCommandHandler : IRequestHandler<VerifyOtpTokenComman
             await _context.Users.AddAsync(user, cancellationToken);
             user.AddDomainEvent(new CreateNewUserEvent(user));
             await _context.SaveChangesAsync(cancellationToken);
-            await _context.UserRoles.AddAsync(new()
+            
+            var userRole = new UserRole
             {
                 UserId = user.Id,
-                RoleId = 1,//UserRoleEnum.User
-                
-            },cancellationToken);
-            user.AddDomainEvent(new CreateNewUserEvent(user));
+                RoleId = 1, //UserRoleEnum.User
+            };
+         
+            await _context.UserRoles.AddAsync(userRole, cancellationToken);
+            user.AddDomainEvent(new CreateNewUserRoleEvent(userRole));
+            
+            var userWallet = new UserWallet
+            {
+                UserId = user.Id,
+                Balance = 0,
+                NetworkBalance = 0
+            };
+            await _context.UserWallets.AddAsync(userWallet, cancellationToken);
+            user.AddDomainEvent(new CreateNewUserWalletEvent(userWallet));
             await _context.SaveChangesAsync(cancellationToken);
         }
         else
@@ -98,4 +117,4 @@ public class VerifyOtpTokenCommandHandler : IRequestHandler<VerifyOtpTokenComman
             RemainingSeconds = (otp.ExpiresAt - now).Seconds
         };
     }
-}
+}
\ No newline at end of file
diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs
index 8046c3c..f9e9657 100644
--- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs
@@ -83,26 +83,13 @@ public class
             OrderId = newOrder.Id
         });
         await _context.FactorDetailss.AddRangeAsync(factorDetailsList, cancellationToken);
+        user.UserCartss.Clear();
+        await _context.SaveChangesAsync(cancellationToken);
         var finalResult = new SubmitShopBuyOrderResponseDto()
         {
             Id = newOrder.Id,
-            PaymentMethod = newOrder.PaymentMethod,
-            PaymentStatus = newOrder.PaymentStatus,
-            TotalAmount = newOrder.Amount,
-            UserAddressText = user.UserAddresss.First(f => f.IsDefault).Address,
-            PaymentDate = newOrder.PaymentDate,
-            FactorDetails = factorDetailsList.Select(s => new SubmitShopBuyOrderFactorDetail()
-            {
-                Count = s.Count,
-                UnitPrice = s.UnitPrice,
-                ProductId = s.ProductId,
-                ProductThumbnailPath = user.UserCartss.First(f => f.ProductId == s.ProductId).Product.ThumbnailPath,
-                ProductTitle =  user.UserCartss.First(f => f.ProductId == s.ProductId).Product.Title,
-                UnitDiscountPrice = 0,
-            }).ToList()
+  
         };
-        user.UserCartss.Clear();
-        await _context.SaveChangesAsync(cancellationToken);
         return finalResult;
     }
 }
\ No newline at end of file
diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
index 361b29c..69f3f6d 100644
--- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
@@ -1,3 +1,5 @@
+using CMSMicroservice.Domain.Enums;
+
 namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter;
 public class GetAllUserOrderByFilterResponseDto
 {
diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderQueryHandler.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderQueryHandler.cs
index ef029d9..d39c01f 100644
--- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderQueryHandler.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderQueryHandler.cs
@@ -12,6 +12,9 @@ public class GetUserOrderQueryHandler : IRequestHandler<GetUserOrderQuery, GetUs
         CancellationToken cancellationToken)
     {
         var response = await _context.UserOrders
+            .Include(i => i.UserAddress)
+            .Include(i => i.FactorDetailss)
+            
             .AsNoTracking()
             .Where(x => x.Id == request.Id)
             .ProjectToType<GetUserOrderResponseDto>()
diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
index 934d502..b78e0bc 100644
--- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
@@ -1,3 +1,5 @@
+using CMSMicroservice.Domain.Enums;
+
 namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetUserOrder;
 public class GetUserOrderResponseDto
 {
diff --git a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj
index b7aaec7..61b5d4a 100644
--- a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj
+++ b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.0.127</Version>
+    <Version>0.0.128</Version>
     <DebugType>None</DebugType>
     <DebugSymbols>False</DebugSymbols>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>