hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-13 17:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试

Browse Source
This commit is contained in:
YunaiV
2023-06-03 11:53:40 +08:00
parent 636b14ccce
commit 1452f6b231
9 changed files with 314 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
View File

@@ -101,7 +101,8 @@ public class TradeCouponPriceCalculator implements TradePriceCalculator {
CouponRespDTO coupon) {
Predicate<TradePriceCalculateRespBO.OrderItem> matchPredicate = TradePriceCalculateRespBO.OrderItem::getSelected;
if (PromotionProductScopeEnum.SPU.getScope().equals(coupon.getProductScope())) {
matchPredicate = orderItem -> coupon.getProductSpuIds().contains(orderItem.getSpuId());
matchPredicate = matchPredicate // 额外加如下条件
.and(orderItem -> coupon.getProductSpuIds().contains(orderItem.getSpuId()));
}
return filterList(result.getItems(), matchPredicate);
}

29
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
View File

@@ -15,8 +15,6 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue;
import static java.util.Collections.singletonList;
// TODO 芋艿：改成父类
/**
* {@link TradePriceCalculator} 的工具类
*
@@ -106,6 +104,31 @@ public class TradePriceCalculatorHelper {
- orderItem.getPointPrice());
}
/**
* 重新计算每个订单项的支付金额
*
* 【目前主要是单测使用】
*
* @param orderItems 订单项数组
*/
public static void recountPayPrice(List<TradePriceCalculateRespBO.OrderItem> orderItems) {
orderItems.forEach(orderItem -> {
if (orderItem.getDiscountPrice() == null) {
orderItem.setDiscountPrice(0);
}
if (orderItem.getDeliveryPrice() == null) {
orderItem.setDeliveryPrice(0);
}
if (orderItem.getCouponPrice() == null) {
orderItem.setCouponPrice(0);
}
if (orderItem.getPointPrice() == null) {
orderItem.setPointPrice(0);
}
recountPayPrice(orderItem);
});
}
/**
* 计算已选中的订单项，总支付金额
*
@@ -114,7 +137,7 @@ public class TradePriceCalculatorHelper {
*/
public static Integer calculateTotalPayPrice(List<TradePriceCalculateRespBO.OrderItem> orderItems) {
return getSumValue(orderItems,
orderItem -> orderItem.getSelected() ? orderItem.getPayPrice() : 0, // 未选中的情况下，不计算支付金额
orderItem -> orderItem.getSelected() ? orderItem.getPayPrice() : 0, // 未选中的情况下，不计算支付金额
Integer::sum);
}

3
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
View File

@@ -53,6 +53,9 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
// 1.2 获得最大匹配的满减送活动的规则
RewardActivityMatchRespDTO.Rule rule = getMaxMatchRewardActivityRule(rewardActivity, orderItems);
if (rule == null) {
TradePriceCalculatorHelper.addNotMatchPromotion(result, orderItems,
rewardActivity.getId(), rewardActivity.getName(), PromotionTypeEnum.REWARD_ACTIVITY.getType(),
getRewardActivityNotMeetTip(rewardActivity));
return;
}