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

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

@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Data
 public class ActivityCalculationDiscountResponseDto {
@@ -126,7 +127,10 @@ public class ActivityCalculationDiscountResponseDto {
          */
         private MonthCardDiscount monthlyEnjoyCardDiscount;
 
-
+        /**
+         * 代金券和折扣券与活动的互斥共享关系(可用优惠券列表使用)
+         */
+        private Set<ActivityTypeSharedExclusive> couponSharedExclusive;
 
 
 

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

+package cn.freemud.entities.dto.calculate;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ActivityTypeSharedExclusive implements Serializable {
+    /**
+     * 活动类型
+     */
+    private Integer activityType;
+
+    /**
+     * 共享或排他活动类型
+     */
+    private Integer sharedExclusiveActivityType;
+
+    /**
+     * 0：排他  1：共享
+     */
+    private Integer sharedExclusive;
+
+    /**
+     * 商品数量和金额门槛是否叠加 0:不叠加,1:叠加
+     */
+    private Integer multiple;
+
+}
\ No newline at end of file

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

@@ -2,6 +2,8 @@ package cn.freemud.entities.vo.coupon;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -36,4 +38,47 @@ public class CartProduct {
 
     //使用的商品券号
     private String couponCode;
+
+    private List<Discount> discounts;
+
+    @Data
+    public static class Discount{
+
+        /**
+         * 活动号
+         */
+        private String activityCode;
+
+        /**
+         * 活动名称
+         */
+        private String activityName;
+
+        /**
+         * 折扣金额
+         */
+        private Long discount;
+
+        /**
+         * 活动类型
+         */
+        private Integer type;
+
+        /**
+         * 当前活动实际优惠的商品数量
+         */
+        private Integer actualGoodsNumber;
+
+        //是否与代金券互斥
+        private boolean cashExclusive = false;
+
+        //是否与代金券叠加门槛
+        private boolean cashMultiple = true;
+
+        //是否与折扣券互斥
+        private boolean discountExclusive = false;
+
+        //是否与折扣券叠加门槛
+        private boolean discountMultiple = true;
+    }
 }

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

@@ -55,4 +55,9 @@ public class CouponAvailableCartInfo {
      * 优惠后 配送费
      */
     private Long distributionFee;
+
+    /**
+     * 是否是新版互斥同享算价
+     */
+    private boolean newCalculation = false;
 }