记得上下班打卡 | git大法好,push需谨慎

Commit 021ea2f3 authored by 胡佳晨's avatar 胡佳晨

修改 商品返回可用演出券 反之同理的bug

parent 506ea472
...@@ -91,6 +91,8 @@ public class CouponBaseUtil { ...@@ -91,6 +91,8 @@ public class CouponBaseUtil {
//适用范围 规则 //适用范围 规则
if (dtoItem.getBusiType().equals(0)) { if (dtoItem.getBusiType().equals(0)) {
isTarget = true; isTarget = true;
} else if (dtoItem.getBusiType().equals(2)) {
isTarget = false;
} else { } else {
for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) { for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew(); CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew();
...@@ -128,7 +130,7 @@ public class CouponBaseUtil { ...@@ -128,7 +130,7 @@ public class CouponBaseUtil {
} }
} }
if ((dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) || dtoItem.getBusiType().equals(2)) { if (dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) {
isTarget = false; isTarget = false;
} }
} }
...@@ -178,6 +180,8 @@ public class CouponBaseUtil { ...@@ -178,6 +180,8 @@ public class CouponBaseUtil {
//适用范围 规则 //适用范围 规则
if (dtoItem.getBusiType().equals(0)) { if (dtoItem.getBusiType().equals(0)) {
isTarget = true; isTarget = true;
} else if (dtoItem.getBusiType().equals(1) || dtoItem.getBusiType().equals(3)) {
isTarget = false;
} else { } else {
for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) { for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew(); CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew();
...@@ -209,7 +213,7 @@ public class CouponBaseUtil { ...@@ -209,7 +213,7 @@ public class CouponBaseUtil {
} }
} }
if ((dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) || (dtoItem.getBusiType().equals(1) || dtoItem.getBusiType().equals(3))) { if (dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) {
isTarget = false; isTarget = 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