Merge branch 'feature/2.0.9-购物车检查券是否可用' into qa

order-application-service/src/main/resources/logback.xml

@@ -2,7 +2,7 @@
 <configuration>
     <property resource="application.properties"/>
     <property name="PROJECT_NAME" value="${spring.application.name}" />
-    <property name="LOG_HOME" value="/data/logs" />
+    <property name="LOG_HOME" value="/media/freemud/_dde_data/data/logs" />
     <!-- %m输出的信息,%p日志级别,%t线程名,%d日期,%c类的全名,,,, -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">

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 (StringUtils.isBlank(couponCode)){
+            return true;
+        }
         if (shoppingCartGoodsResponseVo == null || shoppingCartGoodsResponseVo.getAvailableCoupon() == null || shoppingCartGoodsResponseVo.getAvailableCoupon().getDisableCoupons() == null){
-            return false;
+            return true;
         }
         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;
         }
     }
 }