Merge remote-tracking branch 'remotes/origin/feature/20210828-华莱士新算价互斥同享改版' into qa

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java

@@ -258,6 +258,7 @@ public class ActivityAdapter {
                     CartProduct cartProduct = new CartProduct();
                     cartProduct.setProductId(discountGood.getGoodsId());
                     cartProduct.setQuantity(discountGood.getGoodsQuantity());
+                    cartProduct.setOriginalPrice(discountGood.getOriginalPrice());
 
                     Long mealDiscountAmount = 0L;//套餐优惠不算在内
                     if(CollectionUtils.isNotEmpty(discountGood.getDiscounts())){
@@ -408,6 +409,7 @@ public class ActivityAdapter {
             }
             CartProduct.Discount cartProductDiscount = new CartProduct.Discount();
             BeanUtils.copyProperties(discount,cartProductDiscount);
+            cartProductDiscount.setActualGoodsNumber(discount.getAddOnQuantity());
 
             //是否与代金券互斥
             boolean cashExclusive = Objects.equals(cashExclusiveMap.get(discount.getType()),YesOrNoEnum.NO.getCode());

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java

@@ -362,6 +362,9 @@ public class ActivityCalculationDiscountResponseDto {
                  * 优惠现单价
                  */
                 private Long signleDiscount;
+
+                //活动覆盖商品数量，比如第二件实际优惠一件，但是两件商品都算活动叠加数量
+                private Integer addOnQuantity = 0;
             }
 
             /**

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/coupon/CartProduct.java

@@ -21,6 +21,10 @@ public class CartProduct {
      */
     private String productId;
     /**
+     * 商品原价（分）
+     */
+    private Long originalPrice;
+    /**
      * 总原价金额(包括主商品+可选搭配+加料商品)
      */
     private Long originalTotalAmount;