/getCartInfoByUser 接口 新增返回 配送费相关参数

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -405,6 +405,8 @@ public class ActivityAdapter {
             couponAvailableCartInfo.setRealAmount(0L);
             couponAvailableCartInfo.setDiscountAmount(0L);
         }
+        couponAvailableCartInfo.setDeliveryAmount(discountResult.getDeliveryAmount());
+        couponAvailableCartInfo.setDistributionFee(discountResult.getDistributionFee());
         return couponAvailableCartInfo;
     }
     public CouponAvailableCartInfo convert2CouponAvailableCartInfo(String partnerId,String storeId,ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult, List<String>  orgCodes) {
@@ -461,6 +463,8 @@ public class ActivityAdapter {
             couponAvailableCartInfo.setRealAmount(0L);
             couponAvailableCartInfo.setDiscountAmount(0L);
         }
+        couponAvailableCartInfo.setDeliveryAmount(discountResult.getDeliveryAmount());
+        couponAvailableCartInfo.setDistributionFee(discountResult.getDistributionFee());
         return couponAvailableCartInfo;
     }
     private Pair<Long,Long> getSmallMaterialAmountSharing(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> smallMaterial){

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

 package cn.freemud.entities.vo.coupon;
 
-import cn.freemud.entities.vo.CartGoods;
 import lombok.Data;
 
 import java.util.List;
@@ -47,4 +46,13 @@ public class CouponAvailableCartInfo {
 
     //由于老的算价接口优惠券和活动直接就是互斥的,因此不需要依赖券里面的配置
     private  boolean exclusion = false;
+    /**
+     * 配送费
+     */
+    private Long deliveryAmount;
+
+    /**
+     * 优惠后 配送费
+     */
+    private Long distributionFee;
 }