nft兑换码活动列表增加是否展示延期按钮字段

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExActivityVo.java

@@ -91,11 +91,17 @@ public class GoblinNftExActivityVo implements Serializable, Cloneable {
 
 
     /**
-     *
+     * 是否展示生效中
      */
     @ApiModelProperty(position = 18, required = true, value = "是否展示生效中 0：否  1：是")
     private Integer isDisplay;
 
+    /**
+     * 是否展示延期按钮
+     */
+    @ApiModelProperty(position = 19, required = true, value = "是否展示延期按钮 0不展示 1展示")
+    private Integer isDelay;
+
 
     private final static GoblinNftExActivityVo obj = new GoblinNftExActivityVo();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExActivityServiceImpl.java

@@ -4,8 +4,8 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
@@ -27,7 +27,8 @@ import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author: wll
@@ -120,10 +121,16 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
                 Integer countNumber = 0;
                 Integer useNumber = 0;
                 Integer unUseNumber = 0;
+                Integer invalidNumber = 0; // 失效数量 包含未兑换和已失效(手动失效)的
                 for (GoblinNftExCode goblinNftExCode : goblinNftExCodes) {
                     if (goblinNftExActivity.getActivityId().equals(goblinNftExCode.getActivityId())) {
                         countNumber++;
                         switch (goblinNftExCode.getState()) {
+                            case 1:
+                            case 3:
+                                unUseNumber++;
+                                invalidNumber++;
+                                break;
                             case 2:
                                 useNumber++;
                                 break;
@@ -137,7 +144,22 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
                 goblinNftExActivity.setUseNumber(useNumber);
                 goblinNftExActivity.setUnUseNumber(unUseNumber);
 
-                goblinNftExActivityArrayList.add(GoblinNftExActivityVo.getNew().copy(goblinNftExActivity));
+                GoblinNftExActivityVo goblinNftExActivityVo = GoblinNftExActivityVo.getNew().copy(goblinNftExActivity);
+
+                // 获取该活动最大的失效时间
+                List<GoblinNftExSku> goblinNftExSkus = goblinNftExSkuMapper.selectList(
+                        Wrappers.lambdaQuery(GoblinNftExSku.class)
+                                .eq(GoblinNftExSku::getActivityId, goblinNftExActivity.getActivityId())
+                                .orderByDesc(GoblinNftExSku::getExStopTime)
+                );
+                if (!CollectionUtil.isEmpty(goblinNftExSkus)) {
+                    LocalDateTime exStopTime = goblinNftExSkus.get(0).getExStopTime();
+                    if (LocalDateTime.now().isAfter(exStopTime) && invalidNumber > 0) {
+                        goblinNftExActivityVo.setIsDelay(1);
+                    }
+                }
+
+                goblinNftExActivityArrayList.add(goblinNftExActivityVo);
             }
         }
 
@@ -204,7 +226,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
                     gCodes.add(goblinNftExCode);
                 }*/
 
-                if (goblinNftExCode.getSkuId().equals(goblinGoodsSku.getSkuId())){
+                if (goblinNftExCode.getSkuId().equals(goblinGoodsSku.getSkuId())) {
                     gCodes.add(goblinNftExCode);
                 }
             }