购物车接口 计算满额减配送费 并返回结果

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

@@ -62,6 +62,8 @@ public class ActivityCalculationDiscountRequestDto {
      */
     private List<CalculationDiscountGoods> goods;
 
+    private Long distributionFee;
+
     @Data
     public static class CalculationDiscountCoupon {
         /**

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

@@ -22,6 +22,11 @@ public class ActivityCalculationDiscountResponseDto {
     private String msg;
 
     /**
+     * 优惠后运费
+     */
+    private Long distributionFee;
+
+    /**
      * 集合外的为系统按照优先级计算出来的优惠信息
      * ，calculationResults集合中的为多种优惠方案
      * 计算出来的优惠信息列表，并按优惠力度倒序排列
@@ -84,6 +89,17 @@ public class ActivityCalculationDiscountResponseDto {
          */
         private List<SubtractStockVO> stocks;
 
+        /**
+         * 配送费
+         */
+        private Long deliveryAmount;
+
+        /**
+         * 优惠后 配送费
+         */
+        private Long distributionFee;
+
+
         @Data
         public static class ActivityPrompt {
 
@@ -120,6 +136,7 @@ public class ActivityCalculationDiscountResponseDto {
              * 11-每满减
              * 12-阶梯满减
              * 2-单品特价
+             * 14-满额减配送费
              * 21-单品折扣
              * 3-优惠券
              * 5-整单满金额折
@@ -134,6 +151,8 @@ public class ActivityCalculationDiscountResponseDto {
              * 83-整单满数量打折
              */
             private Integer type;
+
+            private Long thresholdAmount;
         }
 
         @Data

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -5,6 +5,7 @@ import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.vo.SubtractStockVO;
 import com.alibaba.fastjson.JSON;
+import lombok.Builder;
 import lombok.Data;
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -93,6 +94,27 @@ public class ShoppingCartGoodsDto {
      */
     private List<SubtractStockVO> stocks;
 
+    /**
+     * 配送费
+     */
+    private Long deliveryAmount;
+
+    /**
+     * 减免后配送费
+     */
+    private Long discountDeliveryAmount;
+
+    /**
+     * 满多少额度 减免
+     */
+    private Long thresholdAmount;
+
+    /**
+     * 是否参加满额减免
+     */
+    @Builder.Default
+    private Boolean isDiscountDelivery = false;
+
 
     @Data
     public static class CartGoodsDetailDto {

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

@@ -12,6 +12,7 @@
  */
 package cn.freemud.entities.vo;
 
+import lombok.Builder;
 import lombok.Data;
 
 import java.util.List;
@@ -91,4 +92,29 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      * 会员卡优惠金额
      */
     private Integer cardDiscountAmount;
+
+    /**
+     * 配送费
+     */
+    private Long deliveryAmount;
+
+    /**
+     * 减免后配送费
+     */
+    private Long discountDeliveryAmount;
+
+    /**
+     * 满多少额度 减免
+     */
+    private Long thresholdAmount;
+
+    /**
+     * 是否参加满额减免
+     */
+    @Builder.Default
+    private Boolean isDiscountDelivery = false;
+
+
+
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -17,6 +17,7 @@ public enum ActivityTypeEnum {
     TYPE_11(11, "每满减"),
     TYPE_12(12, "阶梯满减"),
     TYPE_13(13, "新用户立减"),
+    TYPE_14(14, "满额减配送费"),
     TYPE_104(104,"x件y折"),
 
     /**

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

@@ -95,7 +95,7 @@ public interface ShoppingCartNewService {
                                                                                                             Integer orderType,
                                                                                                             List<CartGoods> cartGoodsList,
                                                                                                             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
-                                                                                                            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType);
+                                                                                                            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee);
 
 
     List<CartGoods> updateCartGoodsLegal(CartGoods cartGoods, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<CartGoods> oldAllCartGoodsList);