Merge remote-tracking branch 'origin/master'

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java

@@ -160,11 +160,7 @@ public class SetMealServiceImpl implements IPromotionService {
             return number - cartGoods.getQty() < 0 ? "该商品限" + number + "份优惠 超出按照原价计算哦" : "";
         } else {
             cartGoods.setAmount((cartGoods.getFinalPrice() + productGroupAmount) * cartGoods.getQty());
-            if (goodsMap.get(cartGoods.getGoodsId()).getActualGoodsNumber() > 0) {
-                return "该商品限" + goodsMap.get(cartGoods.getGoodsId()).getActualGoodsNumber() + "份优惠 超出按照原价计算哦";
-            } else {
-                return "";
-            }
+            return "";
         }
     }
 }