商品券真实价格显示

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -85,32 +85,32 @@ public class CouponDiscountCalculation {
             return;
         }
 
-//        Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap = goodsList.parallelStream()
-//                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
-
-//        for (CartGoods cartGoods : cartGoodsList) {
-//            //商品券商品
-//            if (StringUtils.isNotBlank(cartGoods.getCouponCode())) {
-////                String couponCode = cartGoods.getCouponCode();
-////                // 计算优惠信息时，已将券校验过，放在map中
-////                Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult.getValidCouponMap();
-////                if (MapUtils.isNotEmpty(validCouponMap)) {
-////                    CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(couponCode);
-////                    if (checkSpqInfoResponseDto != null) {
-////                        cartGoods.setOriginalPrice(checkSpqInfoResponseDto.getPrice());
-////                        cartGoods.setSpuId(checkSpqInfoResponseDto.getSpuId());
-////                        cartGoods.setSkuId(StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId());
-////                        cartGoods.setQty(1);
-////                        cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
-////                        cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
-////                    }
-////                }
-//                if (goodsMap.get(cartGoods.getGoodsId()) == null) {
-//                    continue;
+        Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap = goodsList.parallelStream()
+                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
+
+        for (CartGoods cartGoods : cartGoodsList) {
+            //商品券商品
+            if (StringUtils.isNotBlank(cartGoods.getCouponCode())) {
+//                String couponCode = cartGoods.getCouponCode();
+//                // 计算优惠信息时，已将券校验过，放在map中
+//                Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult.getValidCouponMap();
+//                if (MapUtils.isNotEmpty(validCouponMap)) {
+//                    CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(couponCode);
+//                    if (checkSpqInfoResponseDto != null) {
+//                        cartGoods.setOriginalPrice(checkSpqInfoResponseDto.getPrice());
+//                        cartGoods.setSpuId(checkSpqInfoResponseDto.getSpuId());
+//                        cartGoods.setSkuId(StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId());
+//                        cartGoods.setQty(1);
+//                        cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
+//                        cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
+//                    }
 //                }
-//                cartGoods.setAmount(goodsMap.get(cartGoods.getGoodsId()).getRealAmount());
-//            }
-//        }
+                if (goodsMap.get(cartGoods.getGoodsId()) == null) {
+                    continue;
+                }
+                cartGoods.setAmount(goodsMap.get(cartGoods.getGoodsId()).getRealAmount());
+            }
+        }
 
         // 当couponCode不为空时，需计算优惠价格
         long couponDiscount = 0;