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

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

@@ -705,7 +705,7 @@ public class CouponServiceImpl implements CouponService {
         // 校验商品可用时间
         ValidateShopProductRequest request = getValidateShopProductRequest(productsVo, requestDto);
         ProductResponseDTO<ValiadShopProductResponse> valiadProductResponse = storeItemClient.validateShopProduct(request);
-        if (null == valiadProductResponse || Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, valiadProductResponse.getErrcode())
+        if (null == valiadProductResponse || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, valiadProductResponse.getErrcode())
                 || valiadProductResponse.getData() == null || CollectionUtils.isEmpty(valiadProductResponse.getData().getSuccessList())) {
             return null;
         }
@@ -742,7 +742,7 @@ public class CouponServiceImpl implements CouponService {
         productType.setSpuId(product.getSpuId());
         productType.setUuid(UUID.randomUUID().toString());
         productType.setValidateAttribute(0);
-        productType.setValidatePrice(1);
+        productType.setValidatePrice(0);
         productType.setValidateStatuses(null);
 
         productTypeList.add(productType);
@@ -823,7 +823,7 @@ public class CouponServiceImpl implements CouponService {
         // 校验商品可用时间
         ValidateShopProductRequest request = getValidateShopProductRequest(productsVo, requestDto);
         ProductResponseDTO<ValiadShopProductResponse> valiadProductResponse = storeItemClient.validateShopProduct(request);
-        if (null == valiadProductResponse || Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, valiadProductResponse.getErrcode())
+        if (null == valiadProductResponse || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, valiadProductResponse.getErrcode())
                 || valiadProductResponse.getData() == null || CollectionUtils.isEmpty(valiadProductResponse.getData().getSuccessList())) {
             return null;
         }

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

@@ -1507,6 +1507,19 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             cartGoods.setPic(productBeanListSpuClass.get(0).getPicture());
             cartGoods.setWeight(productBeanListSpuClass.get(0).getWeight());
             cartGoods.setUnit(productBeanListSpuClass.get(0).getUnit());
+            boolean stockLimit = false;
+            if (productBeanListSpuClass.get(0).getType() == ProductType.NOSPEC.getCode()
+                    && productBeanListSpuClass.get(0).getStockLimit() == 1) {
+                stockLimit = true;
+            } else {
+                for (ProductBeanDTO.SkuProductBean skuProductBean : productBeanListSpuClass.get(0).getSkuList()) {
+                    if (spuId2.equals(skuProductBean.getSkuId()) && skuProductBean.getStockLimit() == 1) {
+                        stockLimit = true;
+                        break;
+                    }
+                }
+            }
+            cartGoods.setStockLimit(stockLimit);
 
             List<String> goodsIds = allCartGoodsList.parallelStream().map(CartGoods::getGoodsId).collect(Collectors.toList());
             boolean hasSpecialGoods = hasSpecialGoods(addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(), userId, addShoppingCartGoodsRequestVo.getAppId(), goodsIds, addShoppingCartGoodsRequestVo.getOrderType());