商品券优惠后金额修改

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

@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -74,38 +75,52 @@ public class CouponDiscountCalculation {
      */
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
 
-        // 当couponCode不为空时，需计算优惠价格
-        long couponDiscount = 0;
-        if (couponPromotionVO != null && StringUtils.isNotEmpty(couponPromotionVO.getCouponCode())
-                && calculationDiscountResult != null) {
-            List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
-            if (CollectionUtils.isNotEmpty(couponResultsList)) {
-                for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
-                    couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
-                }
-            }
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getCouponDiscounts())
+                || !calculationDiscountResult.getCouponDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getActivityType())
+                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getActivityType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getActivityType())) ))) {
+            return;
         }
-        shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
-        //循环购物车商品券
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
+        if (CollectionUtils.isEmpty(goodsList)) {
+            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 (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) {
-                String spqId = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length());
-                // 计算优惠信息时，已将券校验过，放在map中
-                Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult == null ? new HashMap<>() : calculationDiscountResult.getValidCouponMap();
-                if (MapUtils.isNotEmpty(validCouponMap)) {
-                    CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(spqId);
-                    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 (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;
                 }
+                cartGoods.setAmount(goodsMap.get(cartGoods.getGoodsId()).getRealAmount());
             }
         }
 
+        // 当couponCode不为空时，需计算优惠价格
+        long couponDiscount = 0;
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
+        if (CollectionUtils.isNotEmpty(couponResultsList)) {
+            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
+                couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
+            }
+        }
+        shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
     }