Commit 5008358b by 胡敬轩

券码可用券列表查询->购物车->促销新算价

parent 5cd53047
...@@ -410,7 +410,7 @@ public class ActivityAdapter { ...@@ -410,7 +410,7 @@ public class ActivityAdapter {
BeanUtils.copyProperties(discount,cartProductDiscount); 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); cartProductDiscount.setCashExclusive(cashExclusive);
//是否与代金券叠加门槛 //是否与代金券叠加门槛
...@@ -418,7 +418,7 @@ public class ActivityAdapter { ...@@ -418,7 +418,7 @@ public class ActivityAdapter {
cartProductDiscount.setCashMultiple(cashMultiple); 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); cartProductDiscount.setDiscountExclusive(discountExclusive);
//是否与折扣券叠加门槛 //是否与折扣券叠加门槛
...@@ -458,7 +458,7 @@ public class ActivityAdapter { ...@@ -458,7 +458,7 @@ public class ActivityAdapter {
BeanUtils.copyProperties(discount,cartProductDiscount); 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); cartProductDiscount.setCashExclusive(cashExclusive);
//是否与代金券叠加门槛 //是否与代金券叠加门槛
...@@ -466,7 +466,7 @@ public class ActivityAdapter { ...@@ -466,7 +466,7 @@ public class ActivityAdapter {
cartProductDiscount.setCashMultiple(cashMultiple); 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); cartProductDiscount.setDiscountExclusive(discountExclusive);
//是否与折扣券叠加门槛 //是否与折扣券叠加门槛
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment