券 修改 不可用返回在可用列表

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

@@ -147,7 +147,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) || dtoItem.getState().equals(21)) {
                     continue;
                 }
             } else if (type == 2) {
@@ -215,9 +215,8 @@ 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) || dtoItem.getState().equals(21)) {
                     continue;
                 }
             } else if (type == 2) {
@@ -477,7 +476,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
             //删除code redis
             redisDataUtils.delCouponByCode(ccode);
             //添加baseDto -> baseDtoList
-            redisDataUtils.addCouponByUid(uid, baseDto,userCreateTime);
+            redisDataUtils.addCouponByUid(uid, baseDto, userCreateTime);
             //入库
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> objsUserCoupon = CollectionUtil.linkedListObjectArr(),
@@ -523,7 +522,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         String uid = CurrentUtil.getCurrentUid();
         LocalDateTime userCreateTime;
         try {
-            userCreateTime =DateUtil.Formatter.yyyyMMddHHmmssTrim.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
+            userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssTrim.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
         } catch (Exception e) {
             userCreateTime = null;
         }

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

@@ -177,6 +177,7 @@ public class CouponBaseUtil {
                 voRules.setBusiId(ruleItem.getBusiId());
                 voRules.setBusiName(ruleItem.getBusiName());
                 rulesVoList.add(voRules);
+                System.out.println(dtoItem.getUcouponId());
                 switch (ruleItem.getUseScope()) {
                     case 80://商品
                         isTarget = isTargetCoupon(ruleItem.getBusiId(), dtoItem.getCouType(), goodId, priceTotal, dtoItem.getValOver());