微商城运费付款方式

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

@@ -7,6 +7,9 @@ public class DeliveryFeeInfo {
 
     private Long deliveryAmount;
 
-    private Integer deliveryType;
+    /**
+     * 微商城配送类型　到付  0:不包邮; 1:包邮; 2:运费到付
+     */
+    private Integer costType;
 
 }

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

@@ -34,6 +34,12 @@ public class QueryDeliveryTemplateResponseVo {
         /**
          * 是否包邮 -> true:是; false:否
          */
+        @Deprecated
         private Boolean isDispatchFree;
+
+        /**
+         * 微商城配送类型　到付  0:不包邮; 1:包邮; 2:运费到付
+         */
+        private Integer costType;
     }
 }

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

@@ -96,9 +96,9 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     private Long deliveryAmount;
 
     /**
-     * 微商城配送类型　到付
+     * 微商城配送类型　到付  0:不包邮; 1:包邮; 2:运费到付
      */
-    private Integer deliveryType;
+    private Integer costType;
 
     /**
      * 减免后配送费

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

+package cn.freemud.enums;
+
+public enum  DeliveryTemplateCostTypeEnum {
+
+    //0:不包邮; 1:包邮; 2:运费到付
+
+    COST_TYPE_0(0,"不包邮"),
+    COST_TYPE_1(1,"包邮"),
+    COST_TYPE_2(2,"运费到付");
+
+    private Integer code;
+    private String desc;
+
+    DeliveryTemplateCostTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+}

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

@@ -419,7 +419,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 
         DeliveryFeeInfo deliveryFeeInfo = calculateDeliveryAmount(partnerId, shoppingCartInfoRequestVo.getProvince(), cartGoodsList);
         Long deliveryAmount = deliveryFeeInfo.getDeliveryAmount();
-        shoppingCartGoodsResponseVo.setDeliveryType(deliveryFeeInfo.getDeliveryType());
+        shoppingCartGoodsResponseVo.setCostType(deliveryFeeInfo.getCostType());
 
                 ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, shoppingCartInfoRequestVo.getOrderType());
         CouponPromotionVO couponPromotionVO = couponAdapter.getCouponPromotionVO(shoppingCartInfoRequestVo, userLoginInfoDto);
@@ -990,8 +990,9 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         if(!isDispatchFree) {
             deliveryAmount = Long.valueOf(null == queryDeliveryTemplateResponseVo.getData().getFreight() ? 0 : queryDeliveryTemplateResponseVo.getData().getFreight() );
         }
+        //邮费付款方式 DeliveryTemplateCostTypeEnum
         if(queryDeliveryTemplateResponseVo.getData() != null){
-            deliveryFeeInfo.setDeliveryType(1);
+            deliveryFeeInfo.setCostType(queryDeliveryTemplateResponseVo.getData().getCostType());
         }
         deliveryFeeInfo.setDeliveryAmount(deliveryAmount);
         return deliveryFeeInfo;