Commit f65e9ebb by xiaoer.li@freemud.com

支持多买一赠一活动

parent 595f532c
...@@ -83,7 +83,7 @@ public class BuySendPromotionService implements IPromotionService { ...@@ -83,7 +83,7 @@ public class BuySendPromotionService implements IPromotionService {
for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity activityList : sendActivityLists) { for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity activityList : sendActivityLists) {
for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGood : activityList.getSendGoods()) { for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGood : activityList.getSendGoods()) {
sendGoodsMap.put(sendGood.getCategory(), sendGood); sendGoodsMap.put(sendGood.getCategory(), sendGood);
maxNums.put(sendGood.getCategory(), activityList.getMaxNum()); maxNums.put(sendGood.getGoodsId(), activityList.getMaxNum());
} }
} }
List<CartGoods> newCartGoodsList = new ArrayList<>(); List<CartGoods> newCartGoodsList = new ArrayList<>();
...@@ -127,7 +127,7 @@ public class BuySendPromotionService implements IPromotionService { ...@@ -127,7 +127,7 @@ public class BuySendPromotionService implements IPromotionService {
*/ */
for (CartGoods cartGoods : newCartGoodsList) { for (CartGoods cartGoods : newCartGoodsList) {
Integer max = maxNums.get(cartGoods.getGoodsId()); Integer max = maxNums.get(cartGoods.getGoodsId());
if (max <= 0) continue; //if (max <= 0) continue;
if (max < cartGoods.getQty()) { if (max < cartGoods.getQty()) {
cartGoods.setQty(max); cartGoods.setQty(max);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment