Merge remote-tracking branch 'remotes/origin/feature/20210828-华莱士新算价互斥同享改版' into qa

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java

@@ -410,7 +410,7 @@ public class ActivityAdapter {
             BeanUtils.copyProperties(discount,cartProductDiscount);
 
             //是否与代金券互斥
-            boolean cashExclusive = Objects.equals(cashExclusiveMap.get(discount.getType()),YesOrNoEnum.YES.getCode());
+            boolean cashExclusive = Objects.equals(cashExclusiveMap.get(discount.getType()),YesOrNoEnum.NO.getCode());
             cartProductDiscount.setCashExclusive(cashExclusive);
 
             //是否与代金券叠加门槛
@@ -418,7 +418,7 @@ public class ActivityAdapter {
             cartProductDiscount.setCashMultiple(cashMultiple);
 
             //是否与折扣券互斥
-            boolean discountExclusive = Objects.equals(discountExclusiveMap.get(discount.getType()),YesOrNoEnum.YES.getCode());
+            boolean discountExclusive = Objects.equals(discountExclusiveMap.get(discount.getType()),YesOrNoEnum.NO.getCode());
             cartProductDiscount.setDiscountExclusive(discountExclusive);
 
             //是否与折扣券叠加门槛
@@ -458,7 +458,7 @@ public class ActivityAdapter {
             BeanUtils.copyProperties(discount,cartProductDiscount);
 
             //是否与代金券互斥
-            boolean cashExclusive = Objects.equals(cashExclusiveMap.get(discount.getType()),YesOrNoEnum.YES.getCode());
+            boolean cashExclusive = Objects.equals(cashExclusiveMap.get(discount.getType()),YesOrNoEnum.NO.getCode());
             cartProductDiscount.setCashExclusive(cashExclusive);
 
             //是否与代金券叠加门槛
@@ -466,7 +466,7 @@ public class ActivityAdapter {
             cartProductDiscount.setCashMultiple(cashMultiple);
 
             //是否与折扣券互斥
-            boolean discountExclusive = Objects.equals(discountExclusiveMap.get(discount.getType()),YesOrNoEnum.YES.getCode());
+            boolean discountExclusive = Objects.equals(discountExclusiveMap.get(discount.getType()),YesOrNoEnum.NO.getCode());
             cartProductDiscount.setDiscountExclusive(discountExclusive);
 
             //是否与折扣券叠加门槛