Merge branch 'feature/20211220_购物车活动互斥提示_wuping' of…

Merge branch 'feature/20211220_购物车活动互斥提示_wuping' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -27,12 +27,31 @@ public class DistributeBo {
     private Integer flag;
     private String userId;
     private String storeId;
+    private Long nightDistributionFee;
 
     private Boolean hasCoupon = false;
 
     public DistributeBo() {
     }
 
+    public DistributeBo(CalculationDiscountResult discountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, UserLoginInfoDto userLoginInfoDto, CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, String menuType, Long deliveryAmount, String opt, String partnerId, Integer flag, String userId, String storeId, Long nightDistributionFee) {
+        this.discountResult = discountResult;
+        this.cartGoodsList = cartGoodsList;
+        this.shoppingCartGoodsResponseVo = shoppingCartGoodsResponseVo;
+        this.shoppingCartInfoRequestVo = shoppingCartInfoRequestVo;
+        this.userLoginInfoDto = userLoginInfoDto;
+        this.couponPromotionVO = couponPromotionVO;
+        this.activityQueryDto = activityQueryDto;
+        this.menuType = menuType;
+        this.deliveryAmount = deliveryAmount;
+        this.opt = opt;
+        this.partnerId = partnerId;
+        this.flag = flag;
+        this.userId = userId;
+        this.storeId = storeId;
+        this.nightDistributionFee = nightDistributionFee;
+    }
+
     public DistributeBo(CalculationDiscountResult discountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, UserLoginInfoDto userLoginInfoDto, CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, String menuType, Long deliveryAmount, String opt, String partnerId, Integer flag, String userId, String storeId) {
         this.discountResult = discountResult;
         this.cartGoodsList = cartGoodsList;