Merge branch 'master_change_112233' into pre

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

@@ -61,6 +61,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
 
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
+            if(baseVo==null){
+                continue;
+            }
             if (type == 1) {
                 if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
                     continue;
@@ -121,6 +124,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
                 continue;
             }
             CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
+            if(baseVo==null){
+                continue;
+            }
             if (dtoItem.getExclusive().equals(1)) { //会员券
                 memberCoupon.add(baseVo);
             }
@@ -538,6 +544,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             if (uCouponIdList.contains(dtoItem.getUcouponId())) {
                 CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
+                if(baseVo==null){
+                    continue;
+                }
                 vo.add(baseVo);
             } else {
                 continue;

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

 package com.liquidnet.service.candy.util;
 
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.candy.dto.CandyCouponInfoDto;
 import com.liquidnet.service.candy.dto.CandyCouponRuleDto;
 import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
@@ -55,6 +56,9 @@ public class CouponBaseUtil {
         } else {
             vo.setCouType(dtoItem.getCouType());
         }
+        if (dtoItem.getDuedAt() == null) {
+            return null;
+        }
         vo.setState(getCouponState(now, dtoItem.getDuedAt(), dtoItem.getBindAt(), dtoItem.getState()));
         vo.setUseRules(rulesVoList);
         return vo;