Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java

@@ -685,15 +685,6 @@ public class CouponServiceImpl implements CouponService {
                 || valiadProductResponse.getData() == null || CollectionUtils.isEmpty(valiadProductResponse.getData().getSuccessList())) {
             return null;
         }
-
-        List<ProductBeanDTO> productList = valiadProductResponse.getData().getSuccessList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
-
-        Optional<ProductBeanDTO> firstProduct = productList.stream().filter(p -> ObjectUtils.equals(p.getPid(), productsVo.getSpuId())).findFirst();
-        if (!firstProduct.isPresent()) {
-            return null;
-        }
-        ProductBeanDTO spuProduct = firstProduct.get();
-
         CheckSpqInfoResponseDto dto = new CheckSpqInfoResponseDto();
         dto.setCouponCode(couponCode);
         dto.setActiveCode(couponDetailResponseDto.getDetails().get(0).getActive().getActiveCode());
@@ -702,7 +693,7 @@ public class CouponServiceImpl implements CouponService {
         dto.setPrice(productsVo.getFinalPrice());
         dto.setSpuId(productsVo.getSpuId());
         dto.setSpuName(productsVo.getSkuName());
-        dto.setStockLimit(ObjectUtils.equals(1, spuProduct.getStockLimit()));
+        dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
         dto.setSkuId(productsVo.getSkuId());
         dto.setSkuName(StringUtils.isNotBlank(productsVo.getSkuName()) ? productsVo.getSkuName() : productsVo.getSpuName());
         dto.setPicture(productsVo.getSpuPicture());
@@ -812,16 +803,6 @@ public class CouponServiceImpl implements CouponService {
                 || valiadProductResponse.getData() == null || CollectionUtils.isEmpty(valiadProductResponse.getData().getSuccessList())) {
             return null;
         }
-
-        List<ProductBeanDTO> productList = valiadProductResponse.getData().getSuccessList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
-
-        Optional<ProductBeanDTO> firstProduct = productList.stream().filter(p -> ObjectUtils.equals(p.getPid(), productsVo.getSpuId())).findFirst();
-        if (!firstProduct.isPresent()) {
-            return null;
-        }
-        ProductBeanDTO spuProduct = firstProduct.get();
-        // 如果是套餐商品，更新套餐内固定商品&可选商品的详细信息
-        ProductBeanDTO.SkuProductBean skuProduct = spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(productsVo.getSkuId(), p.getSkuId())).findFirst().get();
         CheckSpqInfoResponseDto dto = new CheckSpqInfoResponseDto();
         dto.setCouponCode(couponCode);
         dto.setActiveCode(couponActivityDetail.getActive().getActiveCode());
@@ -835,7 +816,7 @@ public class CouponServiceImpl implements CouponService {
         dto.setPicture(productsVo.getSpuPicture());
         dto.setDefaultSpecName(productsVo.getDefaultSpecName());
         dto.setDefaultSpecId(productsVo.getDefaultSpecId());
-        dto.setStockLimit(ObjectUtils.equals(1, skuProduct.getStockLimit()));
+        dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
         dto.setExtras(productsVo.getExtra());
         dto.setCouponType(couponType);
         log.info("dto***" + dto);