Merge branch 'feature/xukang_20211110_野萃山商品券黑白名单问题' 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

@@ -893,6 +893,10 @@ public class CouponServiceImpl implements CouponService {
         String skuId ;
         List<String> skuIds = Lists.newArrayList();
         if (StringUtils.isEmpty(goodsId)) {
+            if(CouponTypeEnum.TYPE_0.getCode().equals(couponDetailResponseDto.getDetails().get(0).getType())
+                    && Integer.valueOf(1).equals(couponDetailResponseDto.getDetails().get(0).getSubType())) {
+                throw new ServiceException(ResponseResult.SHOPPING_CART_PRODUCT_CAN_NOT_USE, "老版本不支持商品券黑名单商品，请升级小程序。");
+            }
             //券返回的商品id
             skuId = couponDetailResponseDto.getDetails().get(0).getActiveProduct().get(0).getProductIdPartner();
             skuIds.add(String.valueOf(skuId));