兑换码导出和生成规则修改

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

@@ -335,7 +335,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                     if (StringUtil.isNotBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
                         gnc.setExStartTime(goblinNftExSku.getExStartTime());
                         gnc.setExStopTime(goblinNftExSku.getExStopTime());
-                        if (now.isAfter(goblinNftExSku.getExStopTime())) {
+                        if (now.isAfter(goblinNftExSku.getExStopTime()) && !gnc.getState().equals(2)) {
                             gnc.setState(3);
                         }
                         break;
@@ -343,7 +343,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                         if (gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
                             gnc.setExStartTime(goblinNftExSku.getExStartTime());
                             gnc.setExStopTime(goblinNftExSku.getExStopTime());
-                            if (now.isAfter(goblinNftExSku.getExStopTime())) {
+                            if (now.isAfter(goblinNftExSku.getExStopTime()) && !gnc.getState().equals(2)) {
                                 gnc.setState(3);
                             }
                             break;
@@ -401,7 +401,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                     }
                     phonestr.append(data.getPhone()).append(",");
                     phoneList.add(data.getPhone());
-                    if(phoneList.size()>100){
+                    if (phoneList.size() > 100) {
                         break;
                     }
                 }
@@ -412,7 +412,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             return ResponseDto.failure("解析文件失败！");
         }
 
-        if(phoneList.size()>=100){
+        if (phoneList.size() >= 100) {
             return ResponseDto.failure("批量空投暂时数量不能大于100");
         }
 

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

@@ -119,14 +119,14 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
                 }
 
                 // 判断开售、停售时间
-                LocalDateTime saleStartTime = goblinGoodsSku.getSaleStartTime();
+/*                LocalDateTime saleStartTime = goblinGoodsSku.getSaleStartTime();
                 LocalDateTime saleStopTime = goblinGoodsSku.getSaleStopTime();
                 LocalDateTime nowTime = LocalDateTime.now();
                 if (nowTime.isBefore(saleStartTime)) {
                     continue;
                 } else if (null != saleStopTime && nowTime.isAfter(saleStopTime)) {
                     continue;
-                }
+                }*/
 
                 //是否购买
                 if (!goblinGoodsSku.getSkuCanbuy().equals("1")) {