餐盒费收费规则保存订单表

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

@@ -43,7 +43,7 @@ public class ShoppingCartGoodsDto {
     /**
      * 包装费 收费规则　1= 商品级别 2=订单级别
      */
-    private String packageAmountCollectType;
+    private Integer packageAmountCollectType;
 
     /**
      * 积分扣减金额

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -220,5 +220,5 @@ public class OrderExtInfoDto {
     /**
      * 包装费 收费规则　1= 商品级别 2=订单级别
      */
-    private String packageAmountCollectType;
+    private Integer packageAmountCollectType;
 }

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

@@ -64,7 +64,7 @@ public class ShoppingCartGoodsDto {
     /**
      * 包装费 收费规则　1= 商品级别 2=订单级别
      */
-    private String packageAmountCollectType;
+    private Integer packageAmountCollectType;
     /**
      * 积分扣减金额
      */

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

@@ -105,6 +105,7 @@ public class DefaultPromotionService implements IPromotionService {
         shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount());
         // todo 包装费
         shoppingCartGoodsDto.setPackageAmount(shoppingCartGoodsResponseVo.getNewPackAmount());
+        shoppingCartGoodsDto.setPackageAmountCollectType(shoppingCartGoodsResponseVo.getPackageAmountCollectType());
         //快递费
         shoppingCartGoodsDto.setDeliveryAmount(shoppingCartGoodsResponseVo.getDeliveryAmount());
         shoppingCartGoodsDto.setDiscountDeliveryAmount(shoppingCartGoodsResponseVo.getDiscountDeliveryAmount());

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

@@ -158,6 +158,7 @@ public class CalculationSharingEquallyService {
         shoppingCartGoodsDto.setDiscountDeliveryActivityCode(shoppingCartGoodsResponseVo.getDiscountDeliveryActivityCode());
         //总计价
         shoppingCartGoodsDto.setPackageAmount(shoppingCartGoodsResponseVo.getNewPackAmount());
+        shoppingCartGoodsDto.setPackageAmountCollectType(shoppingCartGoodsResponseVo.getPackageAmountCollectType());
         shoppingCartGoodsDto.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount());
         shoppingCartGoodsDto.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount());
         shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount());