券键位编号问题修改

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

@@ -109,12 +109,6 @@ public class CouponDiscountCalculation {
                     continue;
                 }
                 cartGoods.setAmount(goodsMap.get(cartGoods.getGoodsId()).getRealAmount());
-
-                //商品券键位编号为空
-                if(StringUtils.isBlank(goodsMap.get(cartGoods.getGoodsId()).getArtNo())){
-                    throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
-                }
-                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getGoodsId()).getArtNo());
             }
         }
 
@@ -134,6 +128,12 @@ public class CouponDiscountCalculation {
      * 商品均摊
      */
     public void updateShoppingCartGoodsApportion(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto){
+
+        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;
+        }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponDiscounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getCouponDiscounts();
 
         for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
@@ -155,6 +155,28 @@ public class CouponDiscountCalculation {
                 }
             }
         }
+
+//        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 (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
+//            //商品券商品
+//            if (StringUtils.isNotBlank(cartGoods.getCouponCode())) {
+//                if (goodsMap.get(cartGoods.getSkuId()) == null) {
+//                    continue;
+//                }
+//                //商品券键位编号为空
+//                if(StringUtils.isBlank(goodsMap.get(cartGoods.getSkuId()).getArtNo())){
+//                    throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
+//                }
+//                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getSkuId()).getArtNo());
+//            }
+//        }
     }
 
 //    public void  getCoupon(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo){