BJ_ZTEITS-Developers / parking-cloud-yudao

Commit f1fa8eadd23d04327ec50a3c34435078eb33ae59

Authored by jason
1 parent 73a781cb

mall - trade - 新增 TradeDeliveryPriceCalculator

Inline Side-by-side
Showing 8 changed files with 271 additions and 3 deletions
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
  View file @f1fa8ea
... ... @@ -141,7 +141,7 @@ public class ProductSpuDO extends BaseDO {
141 141 /**
142 142 * 物流配置模板编号
143 143 *
144   - * 关联 { TradeDeliveryExpressTemplateDO#getId()}
  144 + * 对应 { TradeDeliveryExpressTemplateDO 的 id 编号}
145 145 */
146 146 private Long deliveryTemplateId;
147 147  
... ...
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java
  View file @f1fa8ea
1 1 package cn.iocoder.yudao.module.trade.enums.delivery;
2 2  
  3 +import cn.hutool.core.util.ArrayUtil;
3 4 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
4 5 import lombok.AllArgsConstructor;
5 6 import lombok.Getter;
... ... @@ -35,4 +36,8 @@ public enum DeliveryExpressChargeModeEnum implements IntArrayValuable {
35 36 return ARRAYS;
36 37 }
37 38  
  39 + public static DeliveryExpressChargeModeEnum valueOf(Integer value) {
  40 + return ArrayUtil.firstMatch(chargeMode -> chargeMode.getType().equals(value), DeliveryExpressChargeModeEnum.values());
  41 + }
  42 +
38 43 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateService.java
  View file @f1fa8ea
... ... @@ -63,4 +63,11 @@ public interface DeliveryExpressTemplateService {
63 63 * @return 快递运费模板分页
64 64 */
65 65 PageResult<DeliveryExpressTemplateDO> getDeliveryExpressTemplatePage(DeliveryExpressTemplatePageReqVO pageReqVO);
  66 +
  67 + /**
  68 + * 校验快递运费模板
  69 + * @param templateId 模板编号
  70 + * @return DeliveryExpressTemplateDO 非空
  71 + */
  72 + DeliveryExpressTemplateDO validateDeliveryExpressTemplate(Long templateId);
66 73 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateServiceImpl.java
  View file @f1fa8ea
... ... @@ -202,4 +202,13 @@ public class DeliveryExpressTemplateServiceImpl implements DeliveryExpressTempla
202 202 return expressTemplateMapper.selectPage(pageReqVO);
203 203 }
204 204  
  205 + @Override
  206 + public DeliveryExpressTemplateDO validateDeliveryExpressTemplate(Long templateId) {
  207 + DeliveryExpressTemplateDO template = expressTemplateMapper.selectById(templateId);
  208 + if (template == null) {
  209 + throw exception(EXPRESS_TEMPLATE_NOT_EXISTS);
  210 + }
  211 + return template;
  212 + }
  213 +
205 214 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
  View file @f1fa8ea
1 1 package cn.iocoder.yudao.module.trade.service.price.bo;
2 2  
  3 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
  4 +import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
3 5 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
4 6 import lombok.Data;
5 7  
... ... @@ -45,6 +47,20 @@ public class TradePriceCalculateReqBO {
45 47 private Long addressId;
46 48  
47 49 /**
  50 + * 配送方式
  51 + *
  52 + * 枚举 {@link DeliveryTypeEnum}
  53 + */
  54 + private Integer deliveryType;
  55 +
  56 + /**
  57 + * 配送模板编号
  58 + *
  59 + * 关联 {@link DeliveryExpressTemplateDO#getId()}
  60 + */
  61 + private Long templateId;
  62 +
  63 + /**
48 64 * 商品 SKU 数组
49 65 */
50 66 @NotNull(message = "商品数组不能为空")
... ... @@ -82,5 +98,4 @@ public class TradePriceCalculateReqBO {
82 98 private Boolean selected;
83 99  
84 100 }
85   -
86 101 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java 0 → 100644
  View file @f1fa8ea
  1 +package cn.iocoder.yudao.module.trade.service.price.calculator;
  2 +
  3 +import cn.iocoder.yudao.module.member.api.address.AddressApi;
  4 +import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  5 +import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
  6 +import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
  7 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateChargeDO;
  8 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
  9 +import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateFreeDO;
  10 +import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryExpressTemplateChargeMapper;
  11 +import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryExpressTemplateFreeMapper;
  12 +import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryExpressChargeModeEnum;
  13 +import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
  14 +import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressTemplateService;
  15 +import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
  16 +import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
  17 +import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO.OrderItem;
  18 +import org.springframework.core.annotation.Order;
  19 +import org.springframework.stereotype.Component;
  20 +
  21 +import javax.annotation.Resource;
  22 +import java.util.HashMap;
  23 +import java.util.List;
  24 +import java.util.Map;
  25 +import java.util.Set;
  26 +
  27 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
  28 +
  29 +/**
  30 + * 运费的 {@link TradePriceCalculator} 实现类
  31 + *
  32 + * @author jason
  33 + */
  34 +@Component
  35 +@Order(TradePriceCalculator.ORDER_DELIVERY)
  36 +public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
  37 + @Resource
  38 + private AddressApi addressApi;
  39 + @Resource
  40 + private ProductSkuApi productSkuApi;
  41 + @Resource
  42 + private DeliveryExpressTemplateService deliveryExpressTemplateService;
  43 + @Resource
  44 + private DeliveryExpressTemplateChargeMapper templateChargeMapper;
  45 + @Resource
  46 + private DeliveryExpressTemplateFreeMapper templateFreeMapper;
  47 +
  48 + @Override
  49 + public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
  50 + // 1.1 判断配送方式
  51 + if (param.getDeliveryType() == null || DeliveryTypeEnum.PICK_UP.getMode().equals(param.getDeliveryType())) {
  52 + return;
  53 + }
  54 +
  55 + if (param.getTemplateId() == null || param.getAddressId() == null) {
  56 + return;
  57 + }
  58 + // 1.2 校验运费模板是否存在
  59 + DeliveryExpressTemplateDO template = deliveryExpressTemplateService.validateDeliveryExpressTemplate(param.getTemplateId());
  60 +
  61 + // 得到包邮配置
  62 + List<DeliveryExpressTemplateFreeDO> expressTemplateFreeList = templateFreeMapper.selectListByTemplateId(template.getId());
  63 + Map<Integer, DeliveryExpressTemplateFreeDO> areaTemplateFreeMap = new HashMap<>();
  64 + expressTemplateFreeList.forEach(item -> {
  65 + for (Integer areaId : item.getAreaIds()) {
  66 + // TODO 需要保证 areaId 不能重复
  67 + if (!areaTemplateFreeMap.containsKey(areaId)) {
  68 + areaTemplateFreeMap.put(areaId, item);
  69 + }
  70 + }
  71 + });
  72 + // 得到快递运费配置
  73 + List<DeliveryExpressTemplateChargeDO> expressTemplateChargeList = templateChargeMapper.selectListByTemplateId(template.getId());
  74 + Map<Integer, DeliveryExpressTemplateChargeDO> areaTemplateChargeMap = new HashMap<>();
  75 + expressTemplateChargeList.forEach(item -> {
  76 + for (Integer areaId : item.getAreaIds()) {
  77 + // areaId 不能重复
  78 + if (!areaTemplateChargeMap.containsKey(areaId)) {
  79 + areaTemplateChargeMap.put(areaId, item);
  80 + }
  81 + }
  82 + });
  83 + // 得到收件地址区域
  84 + AddressRespDTO address = addressApi.getAddress(param.getAddressId(), param.getUserId());
  85 + // 1.3 计算快递费用
  86 + calculateDeliveryPrice(address.getAreaId(), template.getChargeMode(),
  87 + areaTemplateFreeMap, areaTemplateChargeMap, result);
  88 + }
  89 +
  90 + /**
  91 + * 校验订单是否满足包邮条件
  92 + *
  93 + * @param receiverAreaId 收件人地区的区域编号
  94 + * @param chargeMode 配送计费方式
  95 + * @param areaTemplateFreeMap 运费模板包邮区域设置 Map
  96 + * @param areaTemplateChargeMap 运费模板快递费用设置 Map
  97 + */
  98 + private void calculateDeliveryPrice(Integer receiverAreaId,
  99 + Integer chargeMode,
  100 + Map<Integer, DeliveryExpressTemplateFreeDO> areaTemplateFreeMap,
  101 + Map<Integer, DeliveryExpressTemplateChargeDO> areaTemplateChargeMap,
  102 + TradePriceCalculateRespBO result) {
  103 + // 过滤出已选中的商品SKU
  104 + List<OrderItem> selectedItem = filterList(result.getItems(), OrderItem::getSelected);
  105 + Set<Long> skuIds = convertSet(selectedItem, OrderItem::getSkuId);
  106 + // 得到SKU 详情。得到 重量体积
  107 + Map<Long, ProductSkuRespDTO> skuRespMap = convertMap(productSkuApi.getSkuList(skuIds), ProductSkuRespDTO::getId);
  108 + // 一个 spuId 可能对应多条订单商品 SKU
  109 + Map<Long, List<OrderItem>> spuIdItemMap = convertMultiMap(selectedItem, OrderItem::getSpuId);
  110 + // 依次计算每个 SPU 的快递运费
  111 + for (Map.Entry<Long, List<OrderItem>> entry : spuIdItemMap.entrySet()) {
  112 + List<OrderItem> orderItems = entry.getValue();
  113 + // 总件数, 总金额, 总重量， 总体积
  114 + int totalCount = 0, totalPrice = 0;
  115 + double totalWeight = 0;
  116 + double totalVolume = 0;
  117 + for (OrderItem orderItem : orderItems) {
  118 + totalCount += orderItem.getCount();
  119 + totalPrice += orderItem.getPrice();
  120 + ProductSkuRespDTO skuResp = skuRespMap.get(orderItem.getSkuId());
  121 + if (skuResp != null) {
  122 + totalWeight = totalWeight + skuResp.getWeight();
  123 + totalVolume = totalVolume + skuResp.getVolume();
  124 + }
  125 + }
  126 + // 优先判断是否包邮. 如果包邮不计算快递运费
  127 + if (areaTemplateFreeMap.containsKey(receiverAreaId) &&
  128 + checkExpressFree(chargeMode, totalCount, totalWeight,
  129 + totalVolume, totalPrice, areaTemplateFreeMap.get(receiverAreaId))) {
  130 + continue;
  131 + }
  132 + // 计算快递运费
  133 + if (areaTemplateChargeMap.containsKey(receiverAreaId)) {
  134 + DeliveryExpressTemplateChargeDO templateCharge = areaTemplateChargeMap.get(receiverAreaId);
  135 + DeliveryExpressChargeModeEnum chargeModeEnum = DeliveryExpressChargeModeEnum.valueOf(chargeMode);
  136 + switch (chargeModeEnum) {
  137 + case PIECE: {
  138 + calculateExpressFeeBySpu(totalCount, templateCharge, orderItems);
  139 + break;
  140 + }
  141 + case WEIGHT: {
  142 + calculateExpressFeeBySpu(totalWeight, templateCharge, orderItems);
  143 + break;
  144 + }
  145 + case VOLUME: {
  146 + calculateExpressFeeBySpu(totalVolume, templateCharge, orderItems);
  147 + break;
  148 + }
  149 + }
  150 + }
  151 + }
  152 + TradePriceCalculatorHelper.recountAllPrice(result);
  153 + }
  154 +
  155 + /**
  156 + * 按 spu 来计算快递费用
  157 + *
  158 + * @param total 总件数/总重量/总体积
  159 + * @param templateCharge 快递运费配置
  160 + * @param orderItems SKU 商品项目
  161 + */
  162 + private void calculateExpressFeeBySpu(double total, DeliveryExpressTemplateChargeDO templateCharge, List<OrderItem> orderItems) {
  163 + int deliveryPrice;
  164 + if (total <= templateCharge.getStartCount()) {
  165 + deliveryPrice = templateCharge.getStartPrice();
  166 + } else {
  167 + double remainWeight = total - templateCharge.getStartCount();
  168 + // 剩余重量/ 续件 = 续件的次数. 向上取整
  169 + int extraNum = (int) Math.ceil(remainWeight / templateCharge.getExtraCount());
  170 + int extraPrice = templateCharge.getExtraPrice() * extraNum;
  171 + deliveryPrice = templateCharge.getStartPrice() + extraPrice;
  172 + }
  173 + //
  174 + // TODO @芋艿 分摊快递费用到 SKU. 是不是搞复杂了
  175 + divideDeliveryPrice(deliveryPrice, orderItems);
  176 + }
  177 +
  178 + /**
  179 + * 快递运费分摊到每个 SKU 商品上
  180 + *
  181 + * @param deliveryPrice 快递运费
  182 + * @param orderItems SKU 商品
  183 + */
  184 + private void divideDeliveryPrice(int deliveryPrice, List<OrderItem> orderItems) {
  185 + int dividePrice = deliveryPrice / orderItems.size();
  186 + for (OrderItem item : orderItems) {
  187 + // 更新快递运费
  188 + item.setDeliveryPrice(dividePrice);
  189 + }
  190 + }
  191 +
  192 + /**
  193 + * 检查是否包邮
  194 + *
  195 + * @param chargeMode 配送计费方式
  196 + * @param totalCount 总件数
  197 + * @param totalWeight 总重量
  198 + * @param totalVolume 总体积
  199 + * @param totalPrice 总金额
  200 + * @param templateFree 包邮配置
  201 + */
  202 + private boolean checkExpressFree(Integer chargeMode, int totalCount, double totalWeight,
  203 + double totalVolume, int totalPrice, DeliveryExpressTemplateFreeDO templateFree) {
  204 + DeliveryExpressChargeModeEnum chargeModeEnum = DeliveryExpressChargeModeEnum.valueOf(chargeMode);
  205 + switch (chargeModeEnum) {
  206 + case PIECE:
  207 + // 两个条件都满足才包邮
  208 + if (totalCount >= templateFree.getFreeCount() && totalPrice >= templateFree.getFreePrice()) {
  209 + return true;
  210 + }
  211 + break;
  212 + case WEIGHT:
  213 + // freeCount 是不是应该是 double ??
  214 + if (totalWeight >= templateFree.getFreeCount()
  215 + && totalPrice >= templateFree.getFreePrice()) {
  216 + return true;
  217 + }
  218 + break;
  219 + case VOLUME:
  220 + if (totalVolume >= templateFree.getFreeCount()
  221 + && totalPrice >= templateFree.getFreePrice()) {
  222 + return true;
  223 + }
  224 + break;
  225 + }
  226 + return false;
  227 + }
  228 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculator.java
  View file @f1fa8ea
... ... @@ -11,6 +11,10 @@ import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
11 11 public interface TradePriceCalculator {
12 12  
13 13 int ORDER_DISCOUNT_ACTIVITY = 10;
  14 + /**
  15 + * TODO @芋艿 快递运费的计算在满减之前。 例如有满多少包邮
  16 + */
  17 + int ORDER_DELIVERY = 15;
14 18 int ORDER_REWARD_ACTIVITY = 20;
15 19 int ORDER_COUPON = 30;
16 20  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/MemberAddressDO.java
  View file @f1fa8ea
... ... @@ -39,7 +39,7 @@ public class MemberAddressDO extends BaseDO {
39 39 /**
40 40 * 地区编号
41 41 */
42   - private Long areaId;
  42 + private Integer areaId;
43 43 /**
44 44 * 收件详细地址
45 45 */
... ...