Merge branch 'kub-stage' into production

2026-05-05 01:54:44 +03:30
parent be2b22c50a 65db839642
commit 34d2354fd4
4 changed files with 17 additions and 5 deletions
@@ -86,10 +86,15 @@ public class DiscountOrderService : DiscountOrderContract.DiscountOrderContractB

    public override async Task<GetOrderByIdResponse> GetOrderById(GetOrderByIdRequest request, ServerCallContext context)
    {
+        var currentUserId = GetCurrentUserId();
+        long? filterUserId = request.UserId > 0
+            ? request.UserId
+            : (currentUserId > 0 ? currentUserId : null);
+
        var query = new GetOrderByIdQuery
        {
            OrderId = request.OrderId,
-            UserId = GetCurrentUserId()
+            UserId = filterUserId
        };
        var result = await _sender.Send(query);
        if (result == null)