Merge remote-tracking branch 'origin/qa' into qa

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

@@ -2135,15 +2135,18 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     }
 
     private boolean checkAvailableCoupon(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, String couponCode) {
-        if (shoppingCartGoodsResponseVo == null || shoppingCartGoodsResponseVo.getAvailableCoupon() == null || shoppingCartGoodsResponseVo.getAvailableCoupon().getUsableCoupons() == null){
-            return false;
+        if (StringUtils.isBlank(couponCode)){
+            return true;
+        }
+        if (shoppingCartGoodsResponseVo == null || shoppingCartGoodsResponseVo.getAvailableCoupon() == null || shoppingCartGoodsResponseVo.getAvailableCoupon().getDisableCoupons() == null){
+            return true;
         }
-        List<ActivityCouponBean> usableCoupons = shoppingCartGoodsResponseVo.getAvailableCoupon().getUsableCoupons();
-        ActivityCouponBean activityCouponBean = usableCoupons.stream().filter(p -> p.getCouponCode().equals(couponCode)).findFirst().orElse(null);
+        List<ActivityCouponBean> disableCoupons = shoppingCartGoodsResponseVo.getAvailableCoupon().getDisableCoupons();
+        ActivityCouponBean activityCouponBean = disableCoupons.stream().filter(p -> p.getCouponCode().equals(couponCode)).findFirst().orElse(null);
         if (activityCouponBean == null){
-            return false;
-        } else {
             return true;
+        } else {
+            return false;
         }
     }
 }