Merge pull request #280 from EasyAbp/fix-GetOrderLinesInScope

Avoid using Unscoped coupons regardless of the amount

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.2.0</Version>
+    <Version>5.3.0-preview.1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

plugins/Coupons/src/EasyAbp.EShop.Orders.Plugins.Coupons/EasyAbp/EShop/Orders/Plugins/Coupons/OrderDiscount/CouponOrderDiscountProvider.cs

@@ -125,20 +125,23 @@ namespace EasyAbp.EShop.Orders.Plugins.Coupons.OrderDiscount
         protected virtual List<IOrderLine> GetOrderLinesInScope(CouponTemplateData couponTemplate,
             OrderDiscountContext context)
         {
+            List<IOrderLine> expectedOrderLines;
+
             if (couponTemplate.IsUnscoped)
             {
-                return context.Order.OrderLines.ToList();
+                expectedOrderLines = context.Order.OrderLines.ToList();
             }
-
+            else
-            var expectedOrderLines = new List<IOrderLine>();
-
-            foreach (var scope in couponTemplate.Scopes.Where(scope => scope.StoreId == context.Order.StoreId))
             {
-                expectedOrderLines.AddRange(context.Order.OrderLines
+                expectedOrderLines = [];
-                    .WhereIf(scope.ProductGroupName != null,
+                foreach (var scope in couponTemplate.Scopes.Where(scope => scope.StoreId == context.Order.StoreId))
-                        x => context.ProductDict[x.ProductId].ProductGroupName == scope.ProductGroupName)
+                {
-                    .WhereIf(scope.ProductId.HasValue, x => x.ProductId == scope.ProductId)
+                    expectedOrderLines.AddRange(context.Order.OrderLines
-                    .WhereIf(scope.ProductSkuId.HasValue, x => x.ProductSkuId == scope.ProductSkuId));
+                        .WhereIf(scope.ProductGroupName != null,
+                            x => context.ProductDict[x.ProductId].ProductGroupName == scope.ProductGroupName)
+                        .WhereIf(scope.ProductId.HasValue, x => x.ProductId == scope.ProductId)
+                        .WhereIf(scope.ProductSkuId.HasValue, x => x.ProductSkuId == scope.ProductSkuId));
+                }
             }
 
             if (expectedOrderLines.IsNullOrEmpty())