黑名单商品券

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

@@ -760,19 +760,26 @@ public class CouponServiceImpl implements CouponService {
         for (GetCouponDetailResponseDto.Details detail : couponDetailResponseDto.getDetails()) {
             if (productValid) break;
             if (!CouponStatus.STATUS_0.getCode().equals(detail.getStatus()) && !CouponStatus.STATUS_2.getCode().equals(detail.getStatus())) continue;
+            if(CouponTypeEnum.TYPE_0.getCode().equals(detail.getType()) && Integer.valueOf(1).equals(detail.getSubType())) {
+                //黑名单商品券处理
                 for (GetCouponDetailResponseDto.ActiveProduct activeProduct : detail.getActiveProduct()) {
                     if (goodsId.equals(activeProduct.getProductIdPartner())) {
-                    if(CouponTypeEnum.TYPE_0.getCode().equals(detail.getType()) && Integer.valueOf(1).equals(detail.getSubType())) {
-                        //券码传过来的是黑名单
-                        return null;
+                        throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST, "加购商品在商品券商品黑名单中。");
+                    }
+                }
+                productValid = true;
+                couponActivityDetail = detail;
+                couponType = CouponTypeEnum.TYPE_4.getCode();
             } else {
+                for (GetCouponDetailResponseDto.ActiveProduct activeProduct : detail.getActiveProduct()) {
+                    if (goodsId.equals(activeProduct.getProductIdPartner())) {
                         productValid = true;
                         couponActivityDetail = detail;
                         couponType = CouponTypeEnum.TYPE_4.getCode();
-                    }
                         break;
                     }
                 }
+            }
             if(CouponTypeEnum.TYPE_7.getCode().equals(detail.getType())){
                 for (GetCouponDetailResponseDto.ActiveProduct activeProduct : detail.getActiveProduct()) {
                     if (goodsId.equals(activeProduct.getProductIdPartner())) {