Commit 66cad2f3 by 胡敬轩

v3算价标志

parent 546b97aa
...@@ -309,7 +309,7 @@ public class ActivityAdapter { ...@@ -309,7 +309,7 @@ public class ActivityAdapter {
// Long sendDiscountAmount = 0L;//赠送和换购商品优惠不算在内 // Long sendDiscountAmount = 0L;//赠送和换购商品优惠不算在内
// Long sendRealAmount = 0L;//赠送和换购商品实付不算在内 // Long sendRealAmount = 0L;//赠送和换购商品实付不算在内
if(discountResult!=null){ if(discountResult!=null){
boolean newCalculation = CollectionUtils.isNotEmpty(discountResult.getCouponSharedExclusive()); boolean newCalculation = discountResult.getV3Promotion();
if(newCalculation){ if(newCalculation){
couponAvailableCartInfo.setNewCalculation(newCalculation); couponAvailableCartInfo.setNewCalculation(newCalculation);
buildOrderDiscount(couponAvailableCartInfo,discountResult.getDiscounts(),discountResult.getCouponSharedExclusive()); buildOrderDiscount(couponAvailableCartInfo,discountResult.getDiscounts(),discountResult.getCouponSharedExclusive());
......
...@@ -105,4 +105,7 @@ public class CalculationDiscountResult { ...@@ -105,4 +105,7 @@ public class CalculationDiscountResult {
*/ */
private Set<ActivityTypeSharedExclusive> couponSharedExclusive; private Set<ActivityTypeSharedExclusive> couponSharedExclusive;
//是否是v3版本算价
private Boolean v3Promotion = false;
} }
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