Commit e3af43f5 by chongfu.liang

fix

parent 2a0ae096
...@@ -217,7 +217,6 @@ public class CalculationSharingDiscountService { ...@@ -217,7 +217,6 @@ public class CalculationSharingDiscountService {
cartGoods.setActivityType(ActivityTypeEnum.TYPE_104.getCode()); cartGoods.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
cartGoods.setActualQty(cartGoods.getQty()); cartGoods.setActualQty(cartGoods.getQty());
cartGoods.setQty(qtyMap.get(key)); cartGoods.setQty(qtyMap.get(key));
if (ObjectUtils.equals(cartGoods.getQty(), 0)){ if (ObjectUtils.equals(cartGoods.getQty(), 0)){
CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods goods = sharingDiscountResponseDto.getResult().getGoods().stream().filter(p -> cartGoods.getCartGoodsUid().equals(p.getOriginalGoodsUid())).findFirst().orElse(null); CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods goods = sharingDiscountResponseDto.getResult().getGoods().stream().filter(p -> cartGoods.getCartGoodsUid().equals(p.getOriginalGoodsUid())).findFirst().orElse(null);
if (goods != null){ if (goods != null){
......
...@@ -163,6 +163,10 @@ public class GiftSharingService { ...@@ -163,6 +163,10 @@ public class GiftSharingService {
sendGoods.setDiscounts(goodsDiscounts); sendGoods.setDiscounts(goodsDiscounts);
goodsList.add(sendGoods); goodsList.add(sendGoods);
sendQty += discount.getActualGoodsNumber(); sendQty += discount.getActualGoodsNumber();
if (goods.getDiscountAmount() != null && discount.getDiscount() != null){
goods.setDiscountAmount(goods.getDiscountAmount() - discount.getDiscount());
}
} }
qtyMap.put(goods.getCartGoodsUid(), goods.getGoodsQuantity() - sendQty); qtyMap.put(goods.getCartGoodsUid(), goods.getGoodsQuantity() - sendQty);
} }
......
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