前后端：商品确认页，增加优惠劵接入

后端：修改了价格计算的逻辑
2019-04-18 22:46:27 +08:00
parent 8962631b6a
commit 7277ecb2d4
34 changed files with 550 additions and 143 deletions
@@ -49,18 +49,62 @@ public class OrderItemDO extends DeletableDO {
     */
    private Integer quantity;
    /**
-     * 价格(分)
+     * 商品成交单价(分)
     */
+    @Deprecated
    private Integer price;
    /**
     * 支付金额（实付金额）
     */
+    @Deprecated
    private Integer payAmount;
    /**
     * 物流金额 (分)
     */
+    @Deprecated
    private Integer logisticsPrice;

+    /**
+     * 原始单价，单位：分。
+     */
+    private Integer originPrice;
+    /**
+     * 购买单价，单位：分
+     */
+    private Integer buyPrice;
+    /**
+     * 最终价格，单位：分。
+     */
+    private Integer presentPrice;
+    /**
+     * 购买总金额，单位：分
+     *
+     * 用途类似 {@link #presentTotal}
+     */
+    private Integer buyTotal;
+    /**
+     * 优惠总金额，单位：分。
+     */
+    private Integer discountTotal;
+    /**
+     * 最终总金额，单位：分。
+     *
+     * 注意，presentPrice * quantity 不一定等于 presentTotal 。
+     * 因为，存在无法整除的情况。
+     * 举个例子，presentPrice = 8.33 ，quantity = 3 的情况，presentTotal 有可能是 24.99 ，也可能是 25 。
+     * 所以，需要存储一个该字段。
+     */
+    private Integer presentTotal;
+    // 如上字段，举个例子：
+    // 假设购买三个，即 quantity = 3 。
+    // originPrice = 15
+    // 使用限时折扣（单品优惠）8 折，buyPrice = 12
+    // 开始算总的价格
+    // buyTotal = buyPrice * quantity = 12 * 3 = 36
+    // discountTotal ，假设有满减送（分组优惠）满 20 减 10 ，并且使用优惠劵满 1.01 减 1 ，则 discountTotal = 10 + 1 = 11
+    // presentTotal = buyTotal - discountTotal = 24 - 11 = 13
+    // 最终 presentPrice = presentTotal / quantity = 13 / 3 = 4.33
+
    ///
    /// 时间信息

@@ -0,0 +1,46 @@
+package cn.iocoder.mall.order.biz.dataobject;
+
+/**
+ * 订单优惠明细
+ */
+// TODO 芋艿 后续在完善
+public class OrderPreferentialDO {
+
+    /**
+     * 编号
+     */
+    private Integer id;
+    /**
+     * 类型
+     *
+     * 1 - 促销活动
+     * 2 - 优惠劵
+     */
+    private Integer type;
+    // TODO 芋艿 优惠劵编号 or 促销活动编号
+    /**
+     * 订单编号
+     */
+    private Integer orderId;
+    /**
+     * 商品 SPU 编号
+     */
+    private Integer spuId;
+    /**
+     * 商品 SKU 编号
+     */
+    private Integer skuId;
+    /**
+     * 商品数量
+     */
+    private Integer quantity;
+    /**
+     * 传入时的价格
+     */
+    private Integer originTotal;
+    /**
+     * 总优惠价格
+     */
+    private Integer discountTotal;
+
+}
@@ -1,5 +0,0 @@
-/**
- * @author Sin
- * @time 2019-03-16 13:49
- */
-package cn.iocoder.mall.order.biz;
@@ -178,17 +178,17 @@ public class CartServiceImpl implements CartService {
        List<CalcOrderPriceBO.ItemGroup> itemGroups = groupByFullPrivilege(items, activityList);
        calcOrderPriceBO.setItemGroups(itemGroups);
        // 4. 计算最终的价格
-        Integer originalTotal = 0;
-        Integer presentTotal = 0;
-        Integer discountTotal = 0;
+        int buyTotal = 0;
+        int discountTotal = 0;
+        int presentTotal = 0;
        for (CalcOrderPriceBO.ItemGroup itemGroup : calcOrderPriceBO.getItemGroups()) {
-            originalTotal += itemGroup.getItems().stream().mapToInt(item -> item.getSelected() ? item.getFee().getOriginalTotal() : 0).sum();
-            discountTotal += itemGroup.getFee().getDiscountTotal() + itemGroup.getItems().stream().mapToInt(item -> item.getSelected() ? item.getFee().getDiscountTotal() : 0).sum();
-            presentTotal += itemGroup.getFee().getPresentTotal();
+            buyTotal += itemGroup.getItems().stream().mapToInt(item -> item.getSelected() ? item.getBuyTotal() : 0).sum();
+            discountTotal += itemGroup.getItems().stream().mapToInt(item -> item.getSelected() ? item.getDiscountTotal() : 0).sum();
+            presentTotal += itemGroup.getItems().stream().mapToInt(item -> item.getSelected() ? item.getPresentTotal() : 0).sum();
        }
-        Assert.isTrue(originalTotal - discountTotal ==  presentTotal,
-                String.format("价格合计( %d - %d == %d )不正确", originalTotal, discountTotal, presentTotal));
-        calcOrderPriceBO.setFee(new CalcOrderPriceBO.Fee(originalTotal, discountTotal, 0, presentTotal));
+        Assert.isTrue(buyTotal - discountTotal ==  presentTotal,
+                String.format("价格合计( %d - %d == %d )不正确", buyTotal, discountTotal, presentTotal));
+        calcOrderPriceBO.setFee(new CalcOrderPriceBO.Fee(buyTotal, discountTotal, 0, presentTotal));
        // 返回
        return CommonResult.success(calcOrderPriceBO);
    }
@@ -215,7 +215,7 @@ public class CartServiceImpl implements CartService {
        // 如果无促销活动，则直接返回默认结果即可
        List<PromotionActivityBO> activityList = activityListResult.getData();
        if (activityList.isEmpty()) {
-            return CommonResult.success(new CalcSkuPriceBO().setOriginalPrice(sku.getPrice()).setPresentPrice(sku.getPrice()));
+            return CommonResult.success(new CalcSkuPriceBO().setOriginalPrice(sku.getPrice()).setBuyPrice(sku.getPrice()));
        }
        // 如果有促销活动，则开始做计算 TODO 芋艿，因为现在暂时只有限时折扣 + 满减送。所以写的比较简单先
        PromotionActivityBO fullPrivilege = findPromotionActivityByType(activityList, PromotionActivityTypeEnum.FULL_PRIVILEGE);
@@ -223,7 +223,7 @@ public class CartServiceImpl implements CartService {
        Integer presentPrice = calcSkuPriceByTimeLimitDiscount(sku, timeLimitedDiscount);
        // 返回结果
        return CommonResult.success(new CalcSkuPriceBO().setFullPrivilege(fullPrivilege).setTimeLimitedDiscount(timeLimitedDiscount)
-                .setOriginalPrice(sku.getPrice()).setPresentPrice(presentPrice));
+                .setOriginalPrice(sku.getPrice()).setBuyPrice(presentPrice));
    }

    private List<CalcOrderPriceBO.Item> initCalcOrderPriceItems(List<ProductSkuDetailBO> skus,
@@ -237,10 +237,12 @@ public class CartServiceImpl implements CartService {
            item.setSelected(calcOrderItem.getSelected());
            item.setBuyQuantity(calcOrderItem.getQuantity());
            // 计算初始价格
-            CalcOrderPriceBO.Fee fee = new CalcOrderPriceBO.Fee(0, 0, 0, 0);
-            fee.setOriginalTotal(item.getPrice() * item.getBuyQuantity());
-            fee.setPresentTotal(fee.getOriginalTotal());
-            item.setFee(fee);
+            item.setOriginPrice(sku.getPrice());
+            item.setBuyPrice(sku.getPrice());
+            item.setPresentPrice(sku.getPrice());
+            item.setBuyTotal(sku.getPrice() * calcOrderItem.getQuantity());
+            item.setDiscountTotal(0);
+            item.setPresentTotal(item.getBuyTotal());
        }
        return items;
    }
@@ -264,10 +266,10 @@ public class CartServiceImpl implements CartService {
            // 设置优惠
            item.setActivity(timeLimitedDiscount);
            // 设置价格
-            item.setDiscountPrice(newPrice);
-            CalcOrderPriceBO.Fee fee = item.getFee();
-            fee.setDiscountTotal(fee.getDiscountTotal() + (item.getPrice() - newPrice) * item.getBuyQuantity());
-            fee.setPresentTotal(fee.getOriginalTotal() - fee.getDiscountTotal() + fee.getPostageTotal());
+            item.setBuyPrice(newPrice);
+            item.setBuyTotal(newPrice * item.getBuyQuantity());
+            item.setPresentTotal(item.getBuyTotal() - item.getDiscountTotal());
+            item.setPresentPrice(item.getPresentTotal() / item.getBuyQuantity());
        }
    }

@@ -302,14 +304,11 @@ public class CartServiceImpl implements CartService {
        }
        // 处理未参加活动的商品，形成一个分组
        if (!items.isEmpty()) {
-            CalcOrderPriceBO.ItemGroup itemGroup = new CalcOrderPriceBO.ItemGroup()
-                    .setItems(items);
-            itemGroups.add(itemGroup);
+            itemGroups.add(new CalcOrderPriceBO.ItemGroup().setItems(items));
        }
        // 计算每个分组的价格
        for (CalcOrderPriceBO.ItemGroup itemGroup : itemGroups) {
-            itemGroup.setFee(calcSkuPriceByFullPrivilege(itemGroup));
-            itemGroup.setActivityEffectEffective(itemGroup.getFee().getDiscountTotal() > 0);
+            itemGroup.setActivityDiscountTotal(calcSkuPriceByFullPrivilege(itemGroup));
        }
        // 返回结果
        return itemGroups;
@@ -346,17 +345,18 @@ public class CartServiceImpl implements CartService {
        throw new IllegalArgumentException(String.format("折扣活动(%s) 的优惠类型不正确", timeLimitedDiscount.toString()));
    }

-    private CalcOrderPriceBO.Fee calcSkuPriceByFullPrivilege(CalcOrderPriceBO.ItemGroup itemGroup) {
+    private Integer calcSkuPriceByFullPrivilege(CalcOrderPriceBO.ItemGroup itemGroup) {
        if (itemGroup.getActivity() == null) {
-            Integer originalTotal = itemGroup.getItems().stream().mapToInt(item -> item.getSelected() ? item.getFee().getPresentTotal() : 0).sum();
-            return new CalcOrderPriceBO.Fee(originalTotal, 0, 0, originalTotal);
+            return null;
        }
        PromotionActivityBO activity = itemGroup.getActivity();
        Assert.isTrue(PromotionActivityTypeEnum.FULL_PRIVILEGE.getValue().equals(activity.getActivityType()),
                "传入的必须的满减送活动必须是满减送");
        // 获得优惠信息
-        Integer itemCnt = itemGroup.getItems().stream().mapToInt(item -> item.getSelected() ? item.getBuyQuantity() : 0).sum();
-        Integer originalTotal = itemGroup.getItems().stream().mapToInt(item -> item.getSelected() ? item.getFee().getPresentTotal() : 0).sum();
+        List<CalcOrderPriceBO.Item> items = itemGroup.getItems().stream().filter(item -> !item.getSelected())
+                .collect(Collectors.toList());
+        Integer itemCnt = items.stream().mapToInt(CalcOrderPriceBO.Item::getBuyQuantity).sum();
+        Integer originalTotal = items.stream().mapToInt(CalcOrderPriceBO.Item::getPresentTotal).sum();
        List<PromotionActivityBO.FullPrivilege.Privilege> privileges = activity.getFullPrivilege().getPrivileges().stream()
                .filter(privilege -> {
                    if (MeetTypeEnum.PRICE.getValue().equals(privilege.getMeetType())) {
@@ -369,7 +369,7 @@ public class CartServiceImpl implements CartService {
                }).collect(Collectors.toList());
        // 获得不到优惠信息，返回原始价格
        if (privileges.isEmpty()) {
-            return new CalcOrderPriceBO.Fee(originalTotal, 0, 0, originalTotal);
+            return null;
        }
        // 获得到优惠信息，进行价格计算
        PromotionActivityBO.FullPrivilege.Privilege privilege = privileges.get(privileges.size() - 1);
@@ -393,7 +393,26 @@ public class CartServiceImpl implements CartService {
        } else {
            throw new IllegalArgumentException(String.format("满减送促销(%s) 的优惠类型不正确", activity.toString()));
        }
-        return new CalcOrderPriceBO.Fee(originalTotal, originalTotal - presentTotal, 0, presentTotal);
+        Integer discountTotal = originalTotal - presentTotal;
+        if (discountTotal == 0) {
+            return null;
+        }
+        // 按比例，拆分 presentTotal
+        for (int i = 0; i < items.size(); i++) {
+            CalcOrderPriceBO.Item item = items.get(i);
+            Integer discountPart;
+            if (i < items.size() - 1) { // 减一的原因，是因为拆分时，如果按照比例，可能会出现.所以最后一个，使用反减
+                discountPart = (int) (discountTotal * (1.0D * item.getPresentTotal() / presentTotal));
+                discountTotal -= discountPart;
+            } else {
+                discountPart = discountTotal;
+            }
+            Assert.isTrue(discountPart > 0, "优惠金额必须大于 0");
+            item.setDiscountTotal(item.getDiscountTotal() + discountPart);
+            item.setPresentTotal(item.getBuyTotal() - item.getDiscountTotal());
+            item.setPresentPrice(item.getPresentTotal() / item.getBuyQuantity());
+        }
+        return originalTotal - presentTotal;
    }

    private PromotionActivityBO findPromotionActivityByType(List<PromotionActivityBO> activityList, PromotionActivityTypeEnum type) {
@@ -212,6 +212,8 @@ public class OrderServiceImpl implements OrderService {
            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_GOODS_INFO_INCORRECT.getCode());
        }

+        //
+
        // 设置 orderItem

        Map<Integer, ProductSkuDetailBO> productSpuBOMap = productResult.getData()
@@ -293,7 +295,7 @@ public class OrderServiceImpl implements OrderService {
                    .setDeleted(DeletedStatusEnum.DELETED_NO.getValue())
                    .setCreateTime(new Date())
                    .setUpdateTime(null);
-            orderItemMapper.insert(orderItemDO);
+            orderItemMapper.insert(orderItemDO); // TODO 芋艿，需要改成一次性插入
        });

        // 创建预订单