Commit af5c9060 by 胡敬轩

券码可用券列表查询->购物车->促销新算价

parent 5008358b
...@@ -408,6 +408,7 @@ public class ActivityAdapter { ...@@ -408,6 +408,7 @@ public class ActivityAdapter {
} }
CartProduct.Discount cartProductDiscount = new CartProduct.Discount(); CartProduct.Discount cartProductDiscount = new CartProduct.Discount();
BeanUtils.copyProperties(discount,cartProductDiscount); BeanUtils.copyProperties(discount,cartProductDiscount);
cartProductDiscount.setActualGoodsNumber(discount.getAddOnQuantity());
//是否与代金券互斥 //是否与代金券互斥
boolean cashExclusive = Objects.equals(cashExclusiveMap.get(discount.getType()),YesOrNoEnum.NO.getCode()); boolean cashExclusive = Objects.equals(cashExclusiveMap.get(discount.getType()),YesOrNoEnum.NO.getCode());
......
...@@ -357,6 +357,9 @@ public class ActivityCalculationDiscountResponseDto { ...@@ -357,6 +357,9 @@ public class ActivityCalculationDiscountResponseDto {
* 优惠现单价 * 优惠现单价
*/ */
private Long signleDiscount; private Long signleDiscount;
//活动覆盖商品数量,比如第二件实际优惠一件,但是两件商品都算活动叠加数量
private Integer addOnQuantity = 0;
} }
/** /**
......
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