库存回滚定时任务，增加 开售后所有库存回滚

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/inner/GoblinNftJobServiceImpl.java

@@ -286,7 +286,7 @@ public class GoblinNftJobServiceImpl {
             List<GoblinNftGoodsSkuListJobVo> notStartSkuInfoVos = mongoTemplate.find(query1, GoblinNftGoodsSkuListJobVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
 
             for (GoblinNftGoodsSkuListJobVo item : notStartSkuInfoVos) {
-                goblinRedisUtils.goblinNftListStock(now, item.getSkuId());
+                goblinRedisUtils.goblinNftListStock(now, item.getSkuId(),item.getSaleStartTime());
             }
         } catch (Exception e) {
             e.printStackTrace();

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -881,37 +881,41 @@ public class GoblinRedisUtils {
      * @param skuId
      * @return
      */
-    public GoblinListCollectVo goblinNftListStock(LocalDateTime now, String skuId) {
+    public void goblinNftListStock(LocalDateTime now, String skuId,LocalDateTime saleStartTime) {
         GoblinListCollectVo collectVo = null;
         GoblinListCollectVo collectTemp = null;
         List<GoblinListCollectVo> collectVos = getGoblinListCollect(skuId);
-        for (int i = 0; i < collectVos.size(); i++) {
-            GoblinListCollectVo collectVoItem = collectVos.get(i);
-            if (now.isAfter(collectVoItem.getTimeStart()) && collectVoItem.getTimeEnd() == null) {
-                if (collectTemp == null || collectTemp.getTimeStart().isBefore(collectVoItem.getTimeStart())) {
-                    collectTemp = collectVoItem;
+        if(now.isAfter(saleStartTime)){
+            lastStockToLastStock(0, collectVos, null, skuId);
+        }else {
+            for (int i = 0; i < collectVos.size(); i++) {
+                GoblinListCollectVo collectVoItem = collectVos.get(i);
+                if (now.isAfter(collectVoItem.getTimeStart()) && collectVoItem.getTimeEnd() == null) {
+                    if (collectTemp == null || collectTemp.getTimeStart().isBefore(collectVoItem.getTimeStart())) {
+                        collectTemp = collectVoItem;
+                    }
+                } else if (now.isAfter(collectVoItem.getTimeStart()) && now.isBefore(collectVoItem.getTimeEnd())) {
+                    collectVo = collectVoItem;
+                    break;
+                } else if (collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())) {
+                    collectTemp = null;
                 }
-            } else if (now.isAfter(collectVoItem.getTimeStart()) && now.isBefore(collectVoItem.getTimeEnd())) {
-                collectVo = collectVoItem;
-                break;
-            } else if (collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())) {
-                collectTemp = null;
             }
-        }
-        if (collectVo == null) {
-            collectVo = collectTemp;
-        }
-        if (collectVo == null) {
-            GoblinListCollectVo collectNext = getCollectByNowNext(now, skuId);
-            if (collectNext == null) {
-                lastStockToLastStock(0, collectVos, null, skuId);
+            if (collectVo == null) {
+                collectVo = collectTemp;
+            }
+            if (collectVo == null) {
+                GoblinListCollectVo collectNext = getCollectByNowNext(now, skuId);
+                if (collectNext == null) {
+                    lastStockToLastStock(0, collectVos, null, skuId);
+                } else {
+                    lastStockToLastStock(1, collectVos, collectNext, skuId);
+                }
             } else {
-                lastStockToLastStock(1, collectVos, collectNext, skuId);
+                lastStockToLastStock(1, collectVos, collectVo, skuId);
             }
-        } else {
-            lastStockToLastStock(1, collectVos, collectVo, skuId);
         }
-        return collectVo;
+//        return collectVo;
     }
 
     /**