Commit a9aee4e6 by xiaoer.li@freemud.com

fixbug 买一赠一判断

parent 5cd4c340
......@@ -249,12 +249,12 @@ public class BuySendPromotionService implements IPromotionService {
*/
private void putNewCartGoodsList(Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsMap, CartGoods
cartGood, List<CartGoods> newCartGoodsList, boolean manyOrSingle) {
if (sendGoodsMap.get(cartGood.getSpuId()) == null) {
if (sendGoodsMap.get(cartGood.getGoodsId()) == null) {
return;
}
if (manyOrSingle) {
// 多规格
if (!Objects.equals(sendGoodsMap.get(cartGood.getSpuId()).getGoodsId(), cartGood.getSkuId())) {
if (!Objects.equals(sendGoodsMap.get(cartGood.getSkuId()).getGoodsId(), cartGood.getSkuId())) {
return;
}
} else {
......@@ -264,7 +264,7 @@ public class BuySendPromotionService implements IPromotionService {
return;
}
}
ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getSpuId());
ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getGoodsId());
CartGoods cartGoods = shoppingCartConvertAdapter.convent2CartGoods(cartGood, sendGoods.getNowPrice());
cartGoods.setClassificationId(cartGood.getClassificationId());
cartGoods.setClassificationName(cartGood.getClassificationName());
......
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