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

Commit c75ce723 authored by 胡佳晨's avatar 胡佳晨

过滤优先券

parent e8495a2b
...@@ -131,6 +131,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -131,6 +131,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
} }
} }
CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId); CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
if(baseVo.getCouType().equals(101)){
continue;
}
if (dtoItem.getExclusive().equals(1)) { //会员券 if (dtoItem.getExclusive().equals(1)) { //会员券
memberCoupon.add(baseVo); memberCoupon.add(baseVo);
} else {//非会员券 } else {//非会员券
...@@ -153,6 +156,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -153,6 +156,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
int canUse = 0; int canUse = 0;
for (CandyUserCouponBasicDto dtoItem : dtoList) { for (CandyUserCouponBasicDto dtoItem : dtoList) {
CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId); CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
if(baseVo.getCouType().equals(101)){
continue;
}
if (baseVo.getState().equals(1)) { //可用 if (baseVo.getState().equals(1)) { //可用
canUse = 1; canUse = 1;
break; break;
...@@ -182,6 +188,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -182,6 +188,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
} }
} }
CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size()); CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size());
if(baseVo.getCouType().equals(101)){
continue;
}
if (dtoItem.getExclusive().equals(1)) { //会员券 if (dtoItem.getExclusive().equals(1)) { //会员券
memberCoupon.add(baseVo); memberCoupon.add(baseVo);
} else {//非会员券 } else {//非会员券
...@@ -204,6 +213,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -204,6 +213,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
int canUse = 0; int canUse = 0;
for (CandyUserCouponBasicDto dtoItem : dtoList) { for (CandyUserCouponBasicDto dtoItem : dtoList) {
CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size()); CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size());
if(baseVo.getCouType().equals(101)){
continue;
}
if (baseVo.getState().equals(1)) { //可用 if (baseVo.getState().equals(1)) { //可用
canUse = 1; canUse = 1;
break; break;
......
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