Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -144,6 +144,7 @@ public class OrderAdapter {
                         .name(OldOrderAccountType.FULL_DISTRIBUTION_FEE.getDesc())
                         .price(deliveryAmount-discountDeliveryAmount)
                         .accountType(QueryOrderAccountType.FULL_DISTRIBUTION_FEE)
+                        .accountId(shoppingCartGoodsDto.getDiscountDeliveryActivityCode())
                         .build();
                 orderAccountDtos.add(createOrderAccountDto);
 
@@ -614,6 +615,7 @@ public class OrderAdapter {
                         .name(OldOrderAccountType.FULL_DISTRIBUTION_FEE.getDesc())
                         .price(deliveryAmount-discountDeliveryAmount)
                         .accountType(QueryOrderAccountType.FULL_DISTRIBUTION_FEE)
+                        .accountId(shoppingCartGoodsDto.getDiscountDeliveryActivityCode())
                         .build();
                 orderAccountDtos.add(createOrderAccountDto);
 

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

@@ -89,6 +89,12 @@ public class ShoppingCartGoodsDto {
     @Builder.Default
     private Boolean isDiscountDelivery = false;
 
+    /**
+     * 配送费活动号
+     *
+     */
+    private String discountDeliveryActivityCode;
+
     @Data
     public static class CartGoodsDetailDto {
         /**

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

@@ -115,6 +115,12 @@ public class ShoppingCartGoodsDto {
     @Builder.Default
     private Boolean isDiscountDelivery = false;
 
+    /**
+     * 配送费活动号
+     *
+     */
+    private String discountDeliveryActivityCode;
+
 
     @Data
     public static class CartGoodsDetailDto {

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

@@ -119,7 +119,10 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      */
     private String deliveryDiscountDesc;
 
-
+    /**
+     * 减免后配送费
+     */
+    private String discountDeliveryActivityCode;
 
 
 }