获取保存的优惠券不校验是否可用

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

@@ -316,12 +316,12 @@ public class ShoppingCartMCoffeeServiceImpl {
          * 如果couponCode为空，则从缓存里尝试获取
          * 如果couponCode不为空，则设置到缓存里
          */
-        List<String> couponList = new ArrayList<>();
+//        List<String> couponList = new ArrayList<>();
         if(StringUtils.isEmpty(couponCode)) {
             couponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService, SaveCouponType.COUPON.getCode());
-            if(StringUtils.isNotEmpty(couponCode)) {
-                couponList.add(couponCode);
-            }
+//            if(StringUtils.isNotEmpty(couponCode)) {
+//                couponList.add(couponCode);
+//            }
         } else {
             if("remove".equals(couponCode)) {
                 couponCode = "";
@@ -331,9 +331,9 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         if(StringUtils.isEmpty(freightCouponCode)) {
             freightCouponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService, SaveCouponType.FREIGHT_COUPON.getCode());
-            if(StringUtils.isNotEmpty(freightCouponCode)) {
-                couponList.add(freightCouponCode);
-            }
+//            if(StringUtils.isNotEmpty(freightCouponCode)) {
+//                couponList.add(freightCouponCode);
+//            }
         } else {
             if("remove".equals(freightCouponCode)) {
                 freightCouponCode = "";
@@ -342,21 +342,21 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         //校验代金券和运费券是否可用
-        if(CollectionUtils.isNotEmpty(couponList)) {
-            List<CouponState> couponStates = couponDiscountCalculation.buildAvailableCoupons(cartGoodsList, partnerId, storeId, couponList);
-            if(CollectionUtils.isNotEmpty(couponStates)) {
-                Map<String, Integer> couponStateMap = couponStates.stream().collect(Collectors.toMap(CouponState::getCouponCode, CouponState::getState, (k1, k2) -> k1));
-                if(null == couponStateMap.get(couponCode) || Objects.equals(couponStateMap.get(couponCode), CouponStateEnum.STATE_1.getCode())) {
-                    couponCode = "";
-                }
-                if(null == couponStateMap.get(freightCouponCode) || Objects.equals(couponStateMap.get(freightCouponCode), CouponStateEnum.STATE_1.getCode())) {
-                    freightCouponCode = "";
-                }
-            } else {
-                couponCode = "";
-                freightCouponCode = "";
-            }
-        }
+//        if(CollectionUtils.isNotEmpty(couponList)) {
+//            List<CouponState> couponStates = couponDiscountCalculation.buildAvailableCoupons(cartGoodsList, partnerId, storeId, couponList);
+//            if(CollectionUtils.isNotEmpty(couponStates)) {
+//                Map<String, Integer> couponStateMap = couponStates.stream().collect(Collectors.toMap(CouponState::getCouponCode, CouponState::getState, (k1, k2) -> k1));
+//                if(null == couponStateMap.get(couponCode) || Objects.equals(couponStateMap.get(couponCode), CouponStateEnum.STATE_1.getCode())) {
+//                    couponCode = "";
+//                }
+//                if(null == couponStateMap.get(freightCouponCode) || Objects.equals(couponStateMap.get(freightCouponCode), CouponStateEnum.STATE_1.getCode())) {
+//                    freightCouponCode = "";
+//                }
+//            } else {
+//                couponCode = "";
+//                freightCouponCode = "";
+//            }
+//        }
 
         shoppingCartInfoRequestVo.setFreightCouponCode(freightCouponCode);