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

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,10 +881,13 @@ 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);
+        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) {
@@ -911,7 +914,8 @@ public class GoblinRedisUtils {
             } else {
                 lastStockToLastStock(1, collectVos, collectVo, skuId);
             }
-        return collectVo;
+        }
+//        return collectVo;
     }
 
     /**