失效的券购物车列表直接移除

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

@@ -91,31 +91,31 @@ public class CalculationSharingDiscountService {
                 if (null == checkSpqInfo) {
                     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, checkSpqInfo);
+                    cartGoods.setName(checkSpqInfo.getCouponName());
+                    cartGoods.setSpuName(checkSpqInfo.getCouponName());
+
+                    CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
+                    coupon.setCode(checkSpqInfo.getCouponCode());
+                    coupon.setActivityCode(checkSpqInfo.getActiveCode());
+                    log.info("coupons={},coupon={}", JSON.toJSONString(coupons), JSON.toJSONString(coupon));
+                    coupons.add(coupon);
+
+                    // 添加商品券代表的商品放入促销
+                    String goodsId = StringUtils.isNotBlank(checkSpqInfo.getSkuId()) ? checkSpqInfo.getSkuId() : checkSpqInfo.getSpuId();
                     if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                        throw new ServiceException(ResponseResult.SHOPPING_CART_HG_COUPON_NOT_EXIST);
+                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, checkSpqInfo.getPrice(), cartGoods.getSpuId());
                     } else {
-                        throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST);
+                        this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, checkSpqInfo.getPrice());
                     }
                 }
-                validCouponMap.put(spqId,checkSpqInfo);
-                cartGoods.setName(checkSpqInfo.getCouponName());
-                cartGoods.setSpuName(checkSpqInfo.getCouponName());
-
-                CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
-                coupon.setCode(checkSpqInfo.getCouponCode());
-                coupon.setActivityCode(checkSpqInfo.getActiveCode());
-                log.info("coupons={},coupon={}", JSON.toJSONString(coupons), JSON.toJSONString(coupon));
-                coupons.add(coupon);
-
-                // 添加商品券代表的商品放入促销
-                String goodsId = StringUtils.isNotBlank(checkSpqInfo.getSkuId()) ? checkSpqInfo.getSkuId(): checkSpqInfo.getSpuId();
-
-                if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                    this.setSpqDiscountGoods(calculationDiscountGoodsList,cartGoods,goodsId,checkSpqInfo.getPrice(),cartGoods.getSpuId());
-                } else {
-                    this.setSpqDiscountGoods(calculationDiscountGoodsList,cartGoods,goodsId,checkSpqInfo.getPrice());
-                }
             }
         }
 

shopping-cart-application-service/src/test/java/cn.freemud/service/CartTest.java

@@ -140,7 +140,7 @@ public class CartTest {
         /**
          * 加价购商品
          */
-        additionSharingService.equally(getShoppingCartGoodsApportionRequestVo.getShoppingCartInfoRequestVo(), null, discountResult, getShoppingCartGoodsApportionRequestVo.getPremiumExchangeActivity());
+        additionSharingService.equally(getShoppingCartGoodsApportionRequestVo.getShoppingCartInfoRequestVo(), null, discountResult, getShoppingCartGoodsApportionRequestVo.getPremiumExchangeActivity(), null);
     }
 
     @Test