From a33e053bc73b628e6eaab6647c8c6d039b29fdac Mon Sep 17 00:00:00 2001 From: misworga831 Date: Tue, 9 May 2023 13:59:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=89=B9=E6=AE=8A=E6=83=85=E5=86=B5?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E5=A6=82=E5=8F=82=E4=B8=8E=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E4=BF=83=E9=94=80=E6=B4=BB=E5=8A=A8=EF=BC=8C=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=95=86=E5=93=81=E5=9C=A8=E5=85=B6=E4=BB=96=E4=BF=83?= =?UTF-8?q?=E9=94=80=E8=AE=A1=E7=AE=97=E5=90=8E=E7=9A=84=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E4=B8=8D=E8=B6=B3=E4=BB=A5=E6=BB=A1=E8=B6=B3=E4=B8=8E=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=8F=82=E4=B8=8E=E7=9A=84=E4=BF=83=E9=94=80=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=9A=84=E4=BC=98=E6=83=A0=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cart/render/util/PromotionPriceUtil.java | 176 ++++++++++++------ 1 file changed, 124 insertions(+), 52 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java b/framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java index dc1c2348..f6e2a2aa 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 促销价格计算业务层实现 @@ -66,7 +67,7 @@ public class PromotionPriceUtil { List skuVOList = tradeDTO.getSkuList(); // 获取map分配sku的总数，如果是最后一个商品分配金额，则将金额从百分比改为总金额扣减，避免出现小数除不尽 - Integer count = skuPromotionDetail.size(); + int count = skuPromotionDetail.size(); //已优惠金额 Double deducted = 0D; @@ -81,12 +82,12 @@ public class PromotionPriceUtil { count--; //sku 优惠金额 - Double skuDiscountPrice = 0d; + Double skuDiscountPrice; //非最后一个商品，则按照比例计算 if (count > 0) { //商品金额占比 - Double point = CurrencyUtil.div(cartSkuVO.getPriceDetailDTO().getGoodsPrice(), totalPrice, 4); + double point = CurrencyUtil.div(cartSkuVO.getPriceDetailDTO().getGoodsPrice(), totalPrice, 4); //商品优惠金额 skuDiscountPrice = CurrencyUtil.mul(discountPrice, point); //累加已优惠金额 @@ -96,64 +97,135 @@ public class PromotionPriceUtil { else { skuDiscountPrice = CurrencyUtil.sub(discountPrice, deducted); } - //优惠券金额，则计入优惠券 ，其他则计入总的discount price - if (promotionTypeEnum == PromotionTypeEnum.COUPON) { - cartSkuVO.getPriceDetailDTO().setCouponPrice( - CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getCouponPrice(), skuDiscountPrice)); - - cartSkuVO.getPriceDetailDTO().addDiscountPriceItem( - DiscountPriceItem.builder() - .goodsId(cartSkuVO.getGoodsSku().getGoodsId()) - .skuId(cartSkuVO.getGoodsSku().getId()) - .discountPrice(skuDiscountPrice) - .promotionTypeEnum(PromotionTypeEnum.COUPON) - .promotionId(activityId) - .build() - ); - - } else if (promotionTypeEnum == PromotionTypeEnum.PLATFORM_COUPON) { - - cartSkuVO.getPriceDetailDTO().setSiteCouponPrice( - CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getCouponPrice(), skuDiscountPrice)); - - cartSkuVO.getPriceDetailDTO().setCouponPrice( - CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getCouponPrice(), cartSkuVO.getPriceDetailDTO().getSiteCouponPrice())); - - - cartSkuVO.getPriceDetailDTO().addDiscountPriceItem( - DiscountPriceItem.builder() - .goodsId(cartSkuVO.getGoodsSku().getGoodsId()) - .skuId(cartSkuVO.getGoodsSku().getId()) - .discountPrice(skuDiscountPrice) - .promotionTypeEnum(PromotionTypeEnum.PLATFORM_COUPON) - .promotionId(activityId) - .build() - ); - - } else { - cartSkuVO.getPriceDetailDTO().setDiscountPrice( - CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getDiscountPrice(), skuDiscountPrice)); - - //目前剩余的只有满减金额活动。后续如果需要调整，这里建议传递活动类型进来 - cartSkuVO.getPriceDetailDTO().addDiscountPriceItem( - DiscountPriceItem.builder() - .goodsId(cartSkuVO.getGoodsSku().getGoodsId()) - .skuId(cartSkuVO.getGoodsSku().getId()) - .discountPrice(skuDiscountPrice) - .promotionTypeEnum(PromotionTypeEnum.FULL_DISCOUNT) - .promotionId(activityId) - .build() - ); - } + calculateCartSkuPromotionsPrice(cartSkuVO, skuDiscountPrice, promotionTypeEnum, activityId); } } } + calculateNotEnoughPromotionsPrice(skuVOList, skuPromotionDetail, discountPrice, totalPrice, promotionTypeEnum, activityId); } + /** + * 计算购物车商品优惠金额 + * + * @param cartSkuVO 购物车商品 + * @param skuDiscountPrice 商品优惠金额 + * @param promotionTypeEnum 优惠类型 + * @param activityId 优惠活动id + */ + private static void calculateCartSkuPromotionsPrice(CartSkuVO cartSkuVO, Double skuDiscountPrice, PromotionTypeEnum promotionTypeEnum, String activityId) { + //优惠券金额，则计入优惠券 ，其他则计入总的discount price + if (promotionTypeEnum == PromotionTypeEnum.COUPON) { + + cartSkuVO.getPriceDetailDTO().setCouponPrice( + CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getCouponPrice(), skuDiscountPrice)); + + cartSkuVO.getPriceDetailDTO().addDiscountPriceItem( + DiscountPriceItem.builder() + .goodsId(cartSkuVO.getGoodsSku().getGoodsId()) + .skuId(cartSkuVO.getGoodsSku().getId()) + .discountPrice(skuDiscountPrice) + .promotionTypeEnum(PromotionTypeEnum.COUPON) + .promotionId(activityId) + .build() + ); + + } else if (promotionTypeEnum == PromotionTypeEnum.PLATFORM_COUPON) { + + cartSkuVO.getPriceDetailDTO().setSiteCouponPrice( + CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getCouponPrice(), skuDiscountPrice)); + + cartSkuVO.getPriceDetailDTO().setCouponPrice( + CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getCouponPrice(), cartSkuVO.getPriceDetailDTO().getSiteCouponPrice())); + + + cartSkuVO.getPriceDetailDTO().addDiscountPriceItem( + DiscountPriceItem.builder() + .goodsId(cartSkuVO.getGoodsSku().getGoodsId()) + .skuId(cartSkuVO.getGoodsSku().getId()) + .discountPrice(skuDiscountPrice) + .promotionTypeEnum(PromotionTypeEnum.PLATFORM_COUPON) + .promotionId(activityId) + .build() + ); + + } else { + cartSkuVO.getPriceDetailDTO().setDiscountPrice( + CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getDiscountPrice(), skuDiscountPrice)); + + //目前剩余的只有满减金额活动。后续如果需要调整，这里建议传递活动类型进来 + cartSkuVO.getPriceDetailDTO().addDiscountPriceItem( + DiscountPriceItem.builder() + .goodsId(cartSkuVO.getGoodsSku().getGoodsId()) + .skuId(cartSkuVO.getGoodsSku().getId()) + .discountPrice(skuDiscountPrice) + .promotionTypeEnum(PromotionTypeEnum.FULL_DISCOUNT) + .promotionId(activityId) + .build() + ); + } + } + + /** + * 特殊情况处理，如参与多个促销活动，部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额 + * + * @param skuVOList 获取购物车信息 + * @param skuPromotionDetail 参与活动的商品，以及商品总金额 + * @param discountPrice 需要分发的优惠金额 + * @param totalPrice 计算总金额 + * @param promotionTypeEnum 优惠类型 + * @param activityId 优惠活动id + */ + private static void calculateNotEnoughPromotionsPrice(List skuVOList, Map skuPromotionDetail, Double discountPrice, Double totalPrice, PromotionTypeEnum promotionTypeEnum, String activityId) { + // 特殊情况处理，如参与多个促销活动，部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额 + // 但当前购物车内存在当前当前促销活动的其他商品且剩余金额也满足分摊不足商品的不足金额，则分摊到其他商品上 + // 满足当前促销的总优惠金额 + if (skuPromotionDetail == null || skuPromotionDetail.isEmpty()) { + return; + } + long matchPromotionsZeroCount = skuVOList.stream().filter(l -> l.getPriceDetailDTO().getFlowPrice() == 0 && skuPromotionDetail.containsKey(l.getGoodsSku().getId())).count(); + long matchPromotionsCount = skuVOList.stream().filter(l -> skuPromotionDetail.containsKey(l.getGoodsSku().getId())).count(); + if (matchPromotionsZeroCount == matchPromotionsCount) { + return; + } + // 获取剩余金额不足优惠金额的商品 + List unEnoughSku = skuVOList.stream().filter(k -> { + if (skuPromotionDetail.containsKey(k.getGoodsSku().getId()) && skuPromotionDetail.size() >= 2) { + //商品金额占比 + double point = CurrencyUtil.div(k.getPriceDetailDTO().getGoodsPrice(), totalPrice, 4); + //商品优惠金额 + Double skuDiscountPrice = CurrencyUtil.mul(discountPrice, point); + return skuDiscountPrice > k.getPriceDetailDTO().getCouponPrice(); + } + return false; + }).collect(Collectors.toList()); + if (!unEnoughSku.isEmpty()) { + for (CartSkuVO cartSkuVO : skuVOList) { + if (unEnoughSku.isEmpty()) { + return; + } + if (skuPromotionDetail.containsKey(cartSkuVO.getGoodsSku().getId()) && unEnoughSku.stream().noneMatch(k -> k.getGoodsSku().getId().equals(cartSkuVO.getGoodsSku().getId()))) { + // 商品金额占比 + double point = CurrencyUtil.div(cartSkuVO.getPriceDetailDTO().getGoodsPrice(), totalPrice, 4); + // 商品优惠金额 + Double skuDiscountPrice = CurrencyUtil.mul(discountPrice, point); + // 商品优惠金额 - 不足优惠金额 = 差额 + Double sub = CurrencyUtil.sub(skuDiscountPrice, unEnoughSku.get(0).getPriceDetailDTO().getCouponPrice()); + // 分摊到其他商品： 其他商品原优惠金额 + 差额 + calculateCartSkuPromotionsPrice(cartSkuVO, sub, promotionTypeEnum, activityId); + // 从不足商品列表中移除 + unEnoughSku.remove(0); + } + } + } else { + return; + } + calculateNotEnoughPromotionsPrice(skuVOList, skuPromotionDetail, discountPrice, totalPrice, promotionTypeEnum, activityId); + } + /** * 检查活动有效时间 *