修复即时单和预约单不返还打包费

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

@@ -45,10 +45,6 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      * 总折扣价
      */
     private Long totalDiscountAmount;
-    /**
-     * 包装费
-     */
-    private Long packAmount;
 
     /**
      * 新包装费（该字段给新版本前端展示，使其好计算）

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

@@ -106,8 +106,8 @@ public class BuySendPromotionService implements IPromotionService {
         activityTip.setActivitySpuIds(activitySpuIds);
         // 当maxNum>=minNum，在加入买一赠一商品时提示“您参加的买赠优惠最多赠送N件哦～”
         shoppingCartGoodsResponseVo.setBuyOneGetActivity(activityTip);
-        Long packAmount = Objects.isNull(shoppingCartGoodsResponseVo.getPackAmount()) ? 0L : shoppingCartGoodsResponseVo.getPackAmount();
-        shoppingCartGoodsResponseVo.setPackAmount(givePackAmount + packAmount);
+        Long packAmount = Objects.isNull(shoppingCartGoodsResponseVo.getNewPackAmount()) ? 0L : shoppingCartGoodsResponseVo.getNewPackAmount();
+        shoppingCartGoodsResponseVo.setNewPackAmount(givePackAmount + packAmount);
         Long originalTotalAmount = Objects.isNull(shoppingCartGoodsResponseVo.getOriginalTotalAmount()) ? 0L : shoppingCartGoodsResponseVo.getOriginalTotalAmount();
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount + giveTotalAmount);
         Long totalDiscountAmount = Objects.isNull(shoppingCartGoodsResponseVo.getTotalDiscountAmount()) ? 0L : shoppingCartGoodsResponseVo.getTotalDiscountAmount();

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

@@ -65,7 +65,6 @@ public class DefaultPromotionService implements IPromotionService {
         }
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(calculationDiscountResult == null ? totalOriginalAmount : calculationDiscountResult.getOriginalTotalAmount());
         shoppingCartGoodsResponseVo.setTotalAmount(calculationDiscountResult == null ? totalAmount : calculationDiscountResult.getTotalAmount());
-        shoppingCartGoodsResponseVo.setPackAmount(totalPackgeAmount);
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
         shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscountResult == null ? 0L : calculationDiscountResult.getTotalDiscountAmount());
     }
@@ -80,7 +79,7 @@ public class DefaultPromotionService implements IPromotionService {
         shoppingCartGoodsDto.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount());
         shoppingCartGoodsDto.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount());
         shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount());
-        shoppingCartGoodsDto.setPackageAmount(shoppingCartGoodsResponseVo.getPackAmount());
+        shoppingCartGoodsDto.setPackageAmount(shoppingCartGoodsResponseVo.getNewPackAmount());
         List<CartGoods> cartGoodsList = shoppingCartGoodsResponseVo.getProducts();
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods> apportionGoodsList =
                 calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getApportionGoods();

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

@@ -1267,26 +1267,22 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
 
         }
-        // 给前端展示
-        shoppingCartGoodsResponseVo.setNewPackAmount(shoppingCartGoodsResponseVo.getPackAmount());
-
         // 更新和添加商品时不需要包装费
         if (ShoppingCartConstant.ADD_AND_UPDATE.equals(opt)) {
-            shoppingCartGoodsResponseVo.setPackAmount(null);
+            shoppingCartGoodsResponseVo.setNewPackAmount(null);
             return;
         }
-
         //==========================  购物车查询特有逻辑  =================================
         // 到店自取包装费设为null,外卖要计算包装费，flag为1表示去结算
         // 兼容老版本判断null
         if (Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.COLLECT_GOODS.getCode())
                 && (Objects.equals(shoppingCartInfoRequestVo.getReachStoreType(), null)
                 || Objects.equals(shoppingCartInfoRequestVo.getReachStoreType(), OrderType.EAT_IN.getCode()))) {
-            shoppingCartGoodsResponseVo.setPackAmount(null);
+            shoppingCartGoodsResponseVo.setNewPackAmount(null);
         } else if ((Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())
                 || Objects.equals(shoppingCartInfoRequestVo.getReachStoreType(), OrderType.COLLECT_GOODS.getCode()))
                 && Objects.equals(shoppingCartInfoRequestVo.getFlag(), CouponFlag.YES.getCode())) {
-            Long packAmount = shoppingCartGoodsResponseVo.getPackAmount() == null ? 0 : shoppingCartGoodsResponseVo.getPackAmount();
+            Long packAmount = shoppingCartGoodsResponseVo.getNewPackAmount() == null ? 0 : shoppingCartGoodsResponseVo.getNewPackAmount();
             Long originalTotalAmount = shoppingCartGoodsResponseVo.getOriginalTotalAmount() + packAmount;
             Long totalAmount = shoppingCartGoodsResponseVo.getTotalAmount() + packAmount;
             shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount);