fix

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

@@ -591,6 +591,9 @@ public class CouponServiceImpl implements CouponService {
                     if (Objects.equals(couponStateVo.getState(), CouponStateEnum.STATE_1.getCode())) {
                         disableCoupons.add(activityCouponBean);
                         disableCouponNum = disableCouponNum + 1;
+                    } else if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_0.getCode()) || Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_4.getCode())) {
+                        disableCoupons.add(activityCouponBean);
+                        disableCouponNum = disableCouponNum + 1;
                     } else {
                         usableCoupons.add(activityCouponBean);
                         usableCouponNum = usableCouponNum + 1;

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

@@ -599,7 +599,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             // check是否反选取消商品券
             if (StringUtils.isNotBlank(unChooseCouponCode)){
                 // 遍历该商品券选择的商品,并将商品券替换为普通商品
-                for (int i = cartGoodsList.size(); i >= 0; i--){
+                for (int i = cartGoodsList.size() - 1; i >= 0; i--){
                     CartGoods cartGoods = cartGoodsList.get(i);
                     if (GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType()) || GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())){
                         CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, cartGoods.getSpuId(), menuType);