商品券白名单

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

@@ -922,14 +922,24 @@ public class CouponServiceImpl implements CouponService {
         if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;
         }
+
         if (CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;
         }
-        Integer couponType = 0;
-
         //券返回的商品id
+        String skuId ;
         List<String> skuIds = Lists.newArrayList();
-        String skuId = goodsId;
+        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));
+        }else {
+            skuId = goodsId;
+        }
         skuIds.add(skuId);
         //TODO 通过skuid查询spuid
         Map<String, GetProductsVo> productsVoMap = itemService.getProducts(skuIds, partnerId, storeId, requestDto.getMenuType());