【BUG】如果没有限时优惠就不展示会员价的问题

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java

@@ -47,64 +47,92 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato
         if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
             return;
         }
+
+        boolean discount;
+        boolean vip;
+
         //----------------------------------限时折扣计算-----------------------------------------
         // 获得 SKU 对应的限时折扣活动
         List<DiscountProductRespDTO> discountProducts = discountActivityApi.getMatchDiscountProductList(
                 convertSet(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSkuId));
         if (CollUtil.isEmpty(discountProducts)) {
-            return;
+            discount = false;
+        }else {
+            discount = true;
         }
         Map<Long, DiscountProductRespDTO> discountProductMap = convertMap(discountProducts, DiscountProductRespDTO::getSkuId);
 
 
 
         //----------------------------------会员计算-----------------------------------------
-
+        MemberLevelRespDTO level;
         // 获得用户的会员等级
         MemberUserRespDTO user = memberUserApi.getUser(param.getUserId());
-        if (user.getLevelId() == null || user.getLevelId() <= 0) {
+        if (user.getLevelId() != null && user.getLevelId() > 0) {
-            return;
+            level = memberLevelApi.getMemberLevel(user.getLevelId());
-        }
+            if (level != null && level.getDiscountPercent() != null) {
-        MemberLevelRespDTO level = memberLevelApi.getMemberLevel(user.getLevelId());
+                vip = true;
-        if (level == null || level.getDiscountPercent() == null) {
+            }else {
-            return;
+                vip = false;
+            }
+        }else {
+            level = null;
+            vip = false;
         }
 
+
         // 2. 计算每个 SKU 的优惠金额
         result.getItems().forEach(orderItem -> {
 
             //----------------------------------限时折扣计算-----------------------------------------
-
+            DiscountProductRespDTO discountProduct = null;
-            // 2.1  计算限时折扣优惠信息
+            Integer newDiscountPrice = 0;
-            DiscountProductRespDTO discountProduct = discountProductMap.get(orderItem.getSkuId());
+            if (discount){
-            if (discountProduct == null) {
+                // 2.1  计算限时折扣优惠信息
-                return;
+                discountProduct = discountProductMap.get(orderItem.getSkuId());
+                if (discountProduct != null) {
+                    // 2.2 计算优惠金额
+                    Integer newPayPrice = calculatePayPrice(discountProduct, orderItem);
+                    newDiscountPrice = orderItem.getPayPrice() - newPayPrice;
+                }
             }
-            // 2.2 计算优惠金额
-            Integer newPayPrice = calculatePayPrice(discountProduct, orderItem);
-            Integer newDiscountPrice = orderItem.getPayPrice() - newPayPrice;
 
 
             //----------------------------------会员计算-----------------------------------------
-
+            Integer vipPrice = 0;
-            // 2.3 计算会员优惠金额
+            if (vip){
-            Integer vipPrice = calculateVipPrice(orderItem.getPayPrice(), level.getDiscountPercent());
+                // 2.3 计算会员优惠金额
-            if (vipPrice <= 0) {
+                vipPrice = calculateVipPrice(orderItem.getPayPrice(), level.getDiscountPercent());
-                return;
             }
 
+
             // 2.4 记录优惠明细
+            // 注意，只有在选中的情况下，才会记录到优惠明细。否则仅仅是更新 SKU 优惠金额，用于展示
             if (orderItem.getSelected()) {
-                if(newDiscountPrice > vipPrice){
+                if (discount && vip){
-                    // 注意，只有在选中的情况下，才会记录到优惠明细。否则仅仅是更新 SKU 优惠金额，用于展示
+                    if(newDiscountPrice > vipPrice){
+                        TradePriceCalculatorHelper.addPromotion(result, orderItem,
+                                discountProduct.getActivityId(), discountProduct.getActivityName(), PromotionTypeEnum.DISCOUNT_ACTIVITY.getType(),
+                                StrUtil.format("限时折扣：省 {} 元", formatPrice(newDiscountPrice)),
+                                newDiscountPrice);
+                        // 2.5 更新 SKU 优惠金额
+                        orderItem.setDiscountPrice(orderItem.getDiscountPrice() + newDiscountPrice);
+                    }else{
+                        TradePriceCalculatorHelper.addPromotion(result, orderItem,
+                                level.getId(), level.getName(), PromotionTypeEnum.MEMBER_LEVEL.getType(),
+                                String.format("会员等级折扣：省 %s 元", formatPrice(vipPrice)),
+                                vipPrice);
+                        // 2.5 更新 SKU 的优惠金额
+                        orderItem.setVipPrice(vipPrice);
+                    }
+                }else if (discount){
                     TradePriceCalculatorHelper.addPromotion(result, orderItem,
                             discountProduct.getActivityId(), discountProduct.getActivityName(), PromotionTypeEnum.DISCOUNT_ACTIVITY.getType(),
                             StrUtil.format("限时折扣：省 {} 元", formatPrice(newDiscountPrice)),
                             newDiscountPrice);
                     // 2.5 更新 SKU 优惠金额
                     orderItem.setDiscountPrice(orderItem.getDiscountPrice() + newDiscountPrice);
-                }else{
+                }else if (vip){
-                    // 注意，只有在选中的情况下，才会记录到优惠明细。否则仅仅是更新 SKU 优惠金额，用于展示
                     TradePriceCalculatorHelper.addPromotion(result, orderItem,
                             level.getId(), level.getName(), PromotionTypeEnum.MEMBER_LEVEL.getType(),
                             String.format("会员等级折扣：省 %s 元", formatPrice(vipPrice)),