Commit df5ada88 by ping.wu

超值加购类型返回

parent 74400eeb
...@@ -129,7 +129,11 @@ public class TimeSaleCalculation { ...@@ -129,7 +129,11 @@ public class TimeSaleCalculation {
activityDiscountsDto.setActivityCode(goodsDiscount.getActivityCode()); activityDiscountsDto.setActivityCode(goodsDiscount.getActivityCode());
activityDiscountsDto.setActualActivityGoodsNumber(goodsDiscount.getActualGoodsNumber()); activityDiscountsDto.setActualActivityGoodsNumber(goodsDiscount.getActualGoodsNumber());
activityDiscountsDto.setActivityName(goodsDiscount.getActivityName()); activityDiscountsDto.setActivityName(goodsDiscount.getActivityName());
activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_2.getCode()); if(ActivityTypeEnum.TYPE_23.getCode() == goodsDiscount.getType()){
activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_23.getCode());
}else {
activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_2.getCode());
}
activityDiscountsDto.setDiscountAmount(totalDiscountAmount.intValue()); activityDiscountsDto.setDiscountAmount(totalDiscountAmount.intValue());
cartGoods.getActivityDiscountsDtos().add(activityDiscountsDto); cartGoods.getActivityDiscountsDtos().add(activityDiscountsDto);
cartGoods.setTotalDiscountAmount(cartGoods.getTotalDiscountAmount() + totalDiscountAmount.intValue()); cartGoods.setTotalDiscountAmount(cartGoods.getTotalDiscountAmount() + totalDiscountAmount.intValue());
......
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