Merge remote-tracking branch 'origin/dev_coupon_sort' into pre

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java

@@ -61,7 +61,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
 
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
-            if(baseVo==null){
+            if (baseVo == null) {
                 continue;
             }
             if (type == 1) {
@@ -124,7 +124,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
                 continue;
             }
             CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
-            if(baseVo==null){
+            if (baseVo == null) {
                 continue;
             }
             if (dtoItem.getExclusive().equals(1)) { //会员券
@@ -153,7 +153,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
             if (type == 1) {
-                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
+                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5) || baseVo.getState().equals(21)) {
                     continue;
                 }
             } else if (type == 2) {
@@ -222,7 +222,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size());
             if (type == 1) {
-                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
+                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5) || baseVo.getState().equals(21)) {
                     continue;
                 }
             } else if (type == 2) {
@@ -544,7 +544,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             if (uCouponIdList.contains(dtoItem.getUcouponId())) {
                 CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
-                if(baseVo==null){
+                if (baseVo == null) {
                     continue;
                 }
                 vo.add(baseVo);