Commit a4815b30d07105dd2cf89ae99e325e687c5cfe09
1 parent
5aacefc0
【缺陷修复】商城：修正商城中将会员等级关闭，还继续计算折扣价格
Showing
1 changed file
with
4 additions
and
1 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
| @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.service.price.calculator; | @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.service.price.calculator; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.util.ObjectUtil; | 3 | import cn.hutool.core.util.ObjectUtil; |
| 4 | import cn.hutool.core.util.StrUtil; | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | ||
| 5 | import cn.iocoder.yudao.module.member.api.level.MemberLevelApi; | 6 | import cn.iocoder.yudao.module.member.api.level.MemberLevelApi; |
| 6 | import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO; | 7 | import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO; |
| 7 | import cn.iocoder.yudao.module.member.api.user.MemberUserApi; | 8 | import cn.iocoder.yudao.module.member.api.user.MemberUserApi; |
| @@ -141,7 +142,9 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato | @@ -141,7 +142,9 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato | ||
| 141 | */ | 142 | */ |
| 142 | public Integer calculateVipPrice(MemberLevelRespDTO level, | 143 | public Integer calculateVipPrice(MemberLevelRespDTO level, |
| 143 | TradePriceCalculateRespBO.OrderItem orderItem) { | 144 | TradePriceCalculateRespBO.OrderItem orderItem) { |
| 144 | - if (level == null || level.getDiscountPercent() == null) { | 145 | + if (level == null |
| 146 | + || CommonStatusEnum.isDisable(level.getStatus()) | ||
| 147 | + || level.getDiscountPercent() == null) { | ||
| 145 | return 0; | 148 | return 0; |
| 146 | } | 149 | } |
| 147 | Integer newPrice = calculateRatePrice(orderItem.getPayPrice(), level.getDiscountPercent().doubleValue()); | 150 | Integer newPrice = calculateRatePrice(orderItem.getPayPrice(), level.getDiscountPercent().doubleValue()); |