Merge branch 'dev_member_voucher_social' of...

Merge branch 'dev_member_voucher_social' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_member_voucher_social

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

@@ -53,16 +53,16 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         List<CandyCouponVo> myCoupon = ObjectUtil.getCandyCouponVoArrayList();
 
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
+            CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
             if (type == 1) {
-                if (dtoItem.getState().equals(3) || dtoItem.getState().equals(5)) {
+                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
                     continue;
                 }
             } else if (type == 2) {
-                if (dtoItem.getState().equals(1)) {
+                if (baseVo.getState().equals(1)) {
                     continue;
                 }
             }
-            CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
             if (dtoItem.getExclusive().equals(1)) { //会员券
                 memberCoupon.add(baseVo);
             } else {//非会员券
@@ -121,16 +121,16 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         List<CandyCouponVo> myCoupon = ObjectUtil.getCandyCouponVoArrayList();
 
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
+            CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
             if (type == 1) {
-                if (dtoItem.getState().equals(3) || dtoItem.getState().equals(5)) {
+                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
                     continue;
                 }
             } else if (type == 2) {
-                if (dtoItem.getState().equals(1)) {
+                if (baseVo.getState().equals(1)) {
                     continue;
                 }
             }
-            CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
             if(baseVo.getCouType().equals(101)){
                 continue;
             }
@@ -178,16 +178,17 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         List<CandyCouponVo> myCoupon = ObjectUtil.getCandyCouponVoArrayList();
 
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
+            CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size());
+
             if (type == 1) {
-                if (dtoItem.getState().equals(3) || dtoItem.getState().equals(5)) {
+                if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
                     continue;
                 }
             } else if (type == 2) {
-                if (dtoItem.getState().equals(1)) {
+                if (baseVo.getState().equals(1)) {
                     continue;
                 }
             }
-            CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size());
             if(baseVo.getCouType().equals(101)){
                 continue;
             }