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

Skip to content

L
liquidnet-bus-v1
Commit 9138cd06 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

改券

parent 7aed1b66
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java
View file @ 9138cd06
...@@ -84,6 +84,7 @@ public class CouponBaseUtil { ...@@ -84,6 +84,7 @@ public class CouponBaseUtil {
vo.setUcouponId(dtoItem.getUcouponId()); vo.setUcouponId(dtoItem.getUcouponId());
vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd)); vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
vo.setUsedFor(dtoItem.getUsedFor()); vo.setUsedFor(dtoItem.getUsedFor());
vo.setBusiType(dtoItem.getBusiType());
//适用范围 规则 //适用范围 规则
if (dtoItem.getBusiType().equals(0)) { if (dtoItem.getBusiType().equals(0)) {
isTarget = true; isTarget = true;
...@@ -110,10 +111,12 @@ public class CouponBaseUtil { ...@@ -110,10 +111,12 @@ public class CouponBaseUtil {
} }
if (dtoItem.getUseRules().size() > 1 && dtoItem.getCouType().equals(4)) { if (dtoItem.getUseRules().size() > 1 && dtoItem.getCouType().equals(4)) {
isTarget = false; 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)) { if (dtoItem.getBusiType().equals(3)) {
...@@ -156,6 +159,7 @@ public class CouponBaseUtil { ...@@ -156,6 +159,7 @@ public class CouponBaseUtil {
vo.setUcouponId(dtoItem.getUcouponId()); vo.setUcouponId(dtoItem.getUcouponId());
vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd)); vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
vo.setUsedFor(dtoItem.getUsedFor()); vo.setUsedFor(dtoItem.getUsedFor());
vo.setBusiType(dtoItem.getBusiType());
//适用范围 规则 //适用范围 规则
if (dtoItem.getBusiType().equals(0)) { if (dtoItem.getBusiType().equals(0)) {
isTarget = true; isTarget = true;
...@@ -179,10 +183,12 @@ public class CouponBaseUtil { ...@@ -179,10 +183,12 @@ public class CouponBaseUtil {
} }
if (size > 1 && dtoItem.getCouType().equals(4)) { if (size > 1 && dtoItem.getCouType().equals(4)) {
isTarget = false; 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)) { 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