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

Commit 9138cd06 authored by 胡佳晨's avatar 胡佳晨

改券

parent 7aed1b66
......@@ -84,6 +84,7 @@ public class CouponBaseUtil {
vo.setUcouponId(dtoItem.getUcouponId());
vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
vo.setUsedFor(dtoItem.getUsedFor());
vo.setBusiType(dtoItem.getBusiType());
//适用范围 规则
if (dtoItem.getBusiType().equals(0)) {
isTarget = true;
......@@ -110,10 +111,12 @@ public class CouponBaseUtil {
}
if (dtoItem.getUseRules().size() > 1 && dtoItem.getCouType().equals(4)) {
isTarget = false;
} else if (dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) {
isTarget = false;
}
}
if (dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) {
isTarget = false;
}
}
//券类别
if (dtoItem.getBusiType().equals(3)) {
......@@ -156,6 +159,7 @@ public class CouponBaseUtil {
vo.setUcouponId(dtoItem.getUcouponId());
vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
vo.setUsedFor(dtoItem.getUsedFor());
vo.setBusiType(dtoItem.getBusiType());
//适用范围 规则
if (dtoItem.getBusiType().equals(0)) {
isTarget = true;
......@@ -179,10 +183,12 @@ public class CouponBaseUtil {
}
if (size > 1 && dtoItem.getCouType().equals(4)) {
isTarget = false;
}else if (dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) {
isTarget = false;
}
}
if (dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) {
isTarget = false;
}
}
//券类别
if (dtoItem.getBusiType().equals(3)) {
......
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