diff --git a/src/CMSMicroservice.Application/DiscountShopCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs b/src/CMSMicroservice.Application/DiscountShopCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs
index 182112e..0216a08 100644
--- a/src/CMSMicroservice.Application/DiscountShopCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs
+++ b/src/CMSMicroservice.Application/DiscountShopCQ/Commands/CompleteOrderPayment/CompleteOrderPaymentCommandHandler.cs
@@ -105,6 +105,7 @@ public class CompleteOrderPaymentCommandHandler : IRequestHandler<CompleteOrderP
 
             transaction.PaymentStatus = PaymentStatus.Reject;
             order.PaymentStatus = PaymentStatus.Reject;
+            order.DeliveryStatus = DeliveryStatus.Cancelled;
 
             await _context.SaveChangesAsync(cancellationToken);
 
diff --git a/src/CMSMicroservice.Infrastructure/BackgroundServices/ExpirePendingOrdersService.cs b/src/CMSMicroservice.Infrastructure/BackgroundServices/ExpirePendingOrdersService.cs
index 54df5f1..47bd396 100644
--- a/src/CMSMicroservice.Infrastructure/BackgroundServices/ExpirePendingOrdersService.cs
+++ b/src/CMSMicroservice.Infrastructure/BackgroundServices/ExpirePendingOrdersService.cs
@@ -89,6 +89,7 @@ public class ExpirePendingOrdersService : BackgroundService
 
                 // تغییر وضعیت به Reject
                 order.PaymentStatus = PaymentStatus.Reject;
+                order.DeliveryStatus = DeliveryStatus.Cancelled;
 
                 // آپدیت تراکنش مربوطه
                 if (order.TransactionId.HasValue)
diff --git a/src/CMSMicroservice.WebApi/Services/DiscountOrderService.cs b/src/CMSMicroservice.WebApi/Services/DiscountOrderService.cs
index e6e44ce..2fea3a3 100644
--- a/src/CMSMicroservice.WebApi/Services/DiscountOrderService.cs
+++ b/src/CMSMicroservice.WebApi/Services/DiscountOrderService.cs
@@ -93,7 +93,7 @@ public class DiscountOrderService : DiscountOrderContract.DiscountOrderContractB
             GatewayAmount = result.GatewayAmountPaid,
             PaymentCompleted = result.PaymentStatus == DomainEnums.PaymentStatus.Success,
             PaymentStatus = MapPaymentStatus(result.PaymentStatus),
-            DeliveryStatus = (DeliveryStatus)(int)result.DeliveryStatus,
+            DeliveryStatus = MapDeliveryStatus(result.DeliveryStatus),
             Created = Timestamp.FromDateTime(DateTime.SpecifyKind(result.Created, DateTimeKind.Utc)),
         };
 
@@ -153,7 +153,7 @@ public class DiscountOrderService : DiscountOrderContract.DiscountOrderContractB
                 GatewayAmount = o.GatewayAmountPaid,
                 PaymentCompleted = o.PaymentStatus == DomainEnums.PaymentStatus.Success,
                 PaymentStatus = MapPaymentStatus(o.PaymentStatus),
-                DeliveryStatus = (DeliveryStatus)(int)o.DeliveryStatus,
+                DeliveryStatus = MapDeliveryStatus(o.DeliveryStatus),
                 ItemsCount = o.ItemsCount,
                 Created = Timestamp.FromDateTime(DateTime.SpecifyKind(o.Created, DateTimeKind.Utc)),
             };
@@ -181,4 +181,15 @@ public class DiscountOrderService : DiscountOrderContract.DiscountOrderContractB
         DomainEnums.PaymentStatus.Pending => CMSMicroservice.Protobuf.Protos.DiscountOrder.PaymentStatus.PaymentPending,
         _ => CMSMicroservice.Protobuf.Protos.DiscountOrder.PaymentStatus.PaymentPending
     };
+
+    private static DeliveryStatus MapDeliveryStatus(DomainEnums.DeliveryStatus status) => status switch
+    {
+        DomainEnums.DeliveryStatus.None => DeliveryStatus.DeliveryPending,
+        DomainEnums.DeliveryStatus.Pending => DeliveryStatus.DeliveryProcessing,
+        DomainEnums.DeliveryStatus.InTransit => DeliveryStatus.DeliveryShipped,
+        DomainEnums.DeliveryStatus.Delivered => DeliveryStatus.DeliveryDelivered,
+        DomainEnums.DeliveryStatus.Returned => DeliveryStatus.DeliveryCancelled,
+        DomainEnums.DeliveryStatus.Cancelled => DeliveryStatus.DeliveryCancelled,
+        _ => DeliveryStatus.DeliveryPending
+    };
 }