Jelajahi Sumber

【缺陷修复】商城:修正商城中将会员等级关闭,还继续计算折扣价格

YunaiV 5 bulan lalu
induk
melakukan
a4815b30d0

+ 4 - 1
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;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
 import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
@@ -141,7 +142,9 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato
      */
     public Integer calculateVipPrice(MemberLevelRespDTO level,
                                       TradePriceCalculateRespBO.OrderItem orderItem) {
-        if (level == null || level.getDiscountPercent() == null) {
+        if (level == null
+                || CommonStatusEnum.isDisable(level.getStatus())
+                || level.getDiscountPercent() == null) {
             return 0;
         }
         Integer newPrice = calculateRatePrice(orderItem.getPayPrice(), level.getDiscountPercent().doubleValue());