Merge remote-tracking branch 'remotes/origin/feature/2020-1026-删除已过期的券'

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

@@ -780,27 +780,27 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 if (checkSpqInfoResponseDto == null) {
                     cartGoodsList.remove(i);
                     assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, null, null, this.shoppingCartBaseService);
+                    //if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                    //    throw new ServiceException(ResponseResult.SHOPPING_CART_HG_COUPON_NOT_EXIST);
+                    //} else {
+                    //    throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST);
+                    //}
+                } else {
+                    validCouponMap.put(spqId, checkSpqInfoResponseDto);
+                    cartGoods.setName(checkSpqInfoResponseDto.getCouponName());
+                    cartGoods.setSpuName(checkSpqInfoResponseDto.getCouponName());
+                    // 添加请求的优惠券信息
+                    ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                    coupon.setCode(checkSpqInfoResponseDto.getCouponCode());
+                    coupon.setActivityCode(checkSpqInfoResponseDto.getActiveCode());
+                    coupons.add(coupon);
+                    // 添加商品券代表的商品
+                    String goodsId = StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId();
                     if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                        throw new ServiceException(ResponseResult.SHOPPING_CART_HG_COUPON_NOT_EXIST);
+                        this.addCalculationDiscountGoods(calculationDiscountGoodsList, goodsId, 1, checkSpqInfoResponseDto.getPrice(), 100, cartGoodsUid, cartGoods.getSpuId());
                     } else {
-                        throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST);
+                        this.addCalculationDiscountGoods(calculationDiscountGoodsList, goodsId, 1, checkSpqInfoResponseDto.getPrice(), 100, cartGoodsUid);
                     }
-
-                }
-                validCouponMap.put(spqId, checkSpqInfoResponseDto);
-                cartGoods.setName(checkSpqInfoResponseDto.getCouponName());
-                cartGoods.setSpuName(checkSpqInfoResponseDto.getCouponName());
-                // 添加请求的优惠券信息
-                ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
-                coupon.setCode(checkSpqInfoResponseDto.getCouponCode());
-                coupon.setActivityCode(checkSpqInfoResponseDto.getActiveCode());
-                coupons.add(coupon);
-                // 添加商品券代表的商品
-                String goodsId = StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId();
-                if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                    this.addCalculationDiscountGoods(calculationDiscountGoodsList, goodsId, 1, checkSpqInfoResponseDto.getPrice(), 100, cartGoodsUid, cartGoods.getSpuId());
-                } else {
-                    this.addCalculationDiscountGoods(calculationDiscountGoodsList, goodsId, 1, checkSpqInfoResponseDto.getPrice(), 100, cartGoodsUid);
                 }
             }
         }