IceCreamShop/IceCreamShopBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -136,7 +136,7 @@ namespace IceCreamShopBusinessLogic.BusinessLogic
                 _logger.LogWarning("Status change operation failed");
                 throw new InvalidOperationException("Текущий статус заказа не может быть переведен в выбранный");
             }
-            if(status == OrderStatus.Готов)
+            if(element.Status == OrderStatus.Готов)
             {
                 var icecream = _iceCreamStorage.GetElement(new IceCreamSearchModel() { Id = model.IceCreamId });
                 if (icecream == null)

IceCreamShop/IceCreamShopFileImplement/Implements/ShopStorage.cs

@@ -114,6 +114,10 @@ model.Id);
                 {
                     var min = Math.Min(icecream.Value.Item2, count);
                     icecreams[icecream.Value.Item1.Id] = (icecream.Value.Item1, icecream.Value.Item2 - min);
+                    if(icecreams[icecream.Value.Item1.Id].Item2 == 0)
+                    {
+                        icecreams.Remove(icecream.Value.Item1.Id);
+                    }
                     count -= min;
 
                     if (count <= 0)