Merge remote-tracking branch 'remotes/origin/feature/1.9.30_买一赠一&第X件Y折' into qa

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

@@ -156,7 +156,7 @@ public class SetMealServiceImpl implements IPromotionService {
             cartGoods.setAmount(productComboxAmount + productGroupAmount * cartGoods.getQty());
             //设置剩余优惠数量
             numberMap.put(cartGoods.getGoodsId(), number - cartGoods.getQty());
-            return number - cartGoods.getQty() < 0 ? "该商品限" + goodsMap.get(cartGoods.getGoodsId()).getActualGoodsNumber() + "份优惠 超出按照原价计算哦" : "";
+            return number - cartGoods.getQty() < 0 ? "该商品限" + number + "份优惠 超出按照原价计算哦" : "";
         } else {
             cartGoods.setAmount((cartGoods.getFinalPrice() + productGroupAmount) * cartGoods.getQty());
             return "该商品限" + goodsMap.get(cartGoods.getGoodsId()).getActualGoodsNumber() + "份优惠 超出按照原价计算哦";

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

@@ -8,6 +8,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.service.IPromotionService;
+import lombok.extern.log4j.Log4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;