记得上下班打卡 | git大法好,push需谨慎

Commit 50dd4151 authored by 胡佳晨's avatar 胡佳晨

修改 分批购 获取当前时间段 和 下一个时间段的bug

parent d26c4b18
...@@ -87,7 +87,7 @@ public class GoblinNftUtils { ...@@ -87,7 +87,7 @@ public class GoblinNftUtils {
} }
/** /**
* 根据时间获取当前分段购vo * 根据时间获取当前分段购vo 如果当前没有返回下一个
* *
* @param now * @param now
* @param skuId * @param skuId
...@@ -110,6 +110,8 @@ public class GoblinNftUtils { ...@@ -110,6 +110,8 @@ public class GoblinNftUtils {
if (collectNext == null || collectNext.getTimeStart().isAfter(collectNext.getTimeStart())) { if (collectNext == null || collectNext.getTimeStart().isAfter(collectNext.getTimeStart())) {
collectNext = collectVoItem; collectNext = collectVoItem;
} }
}else if(collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())){
collectTemp = null;
} }
} }
if (collectVo == null && collectTemp != null) { if (collectVo == null && collectTemp != null) {
...@@ -117,8 +119,6 @@ public class GoblinNftUtils { ...@@ -117,8 +119,6 @@ public class GoblinNftUtils {
} else if (collectVo == null) { } else if (collectVo == null) {
collectVo = collectNext; collectVo = collectNext;
} }
// lastStockToLastStock(1,collectVos, collectVo, skuId);
return collectVo; return collectVo;
} }
......
...@@ -863,6 +863,8 @@ public class GoblinRedisUtils { ...@@ -863,6 +863,8 @@ public class GoblinRedisUtils {
} else if (now.isAfter(collectVoItem.getTimeStart()) && now.isBefore(collectVoItem.getTimeEnd())) { } else if (now.isAfter(collectVoItem.getTimeStart()) && now.isBefore(collectVoItem.getTimeEnd())) {
collectVo = collectVoItem; collectVo = collectVoItem;
break; break;
}else if(collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())){
collectTemp = null;
} }
} }
if (collectVo == null) { if (collectVo == null) {
...@@ -905,6 +907,8 @@ public class GoblinRedisUtils { ...@@ -905,6 +907,8 @@ public class GoblinRedisUtils {
if (collectNext == null || collectNext.getTimeStart().isAfter(collectNext.getTimeStart())) { if (collectNext == null || collectNext.getTimeStart().isAfter(collectNext.getTimeStart())) {
collectNext = collectVoItem; collectNext = collectVoItem;
} }
}else if(collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())){
collectTemp = null;
} }
} }
if (collectVo == null && collectTemp != null) { if (collectVo == null && collectTemp != null) {
......
...@@ -231,6 +231,8 @@ public class GoblinRedisUtils { ...@@ -231,6 +231,8 @@ public class GoblinRedisUtils {
} else if (now.isAfter(collectVoItem.getTimeStart()) && now.isBefore(collectVoItem.getTimeEnd())) { } else if (now.isAfter(collectVoItem.getTimeStart()) && now.isBefore(collectVoItem.getTimeEnd())) {
collectVo = collectVoItem; collectVo = collectVoItem;
break; break;
}else if(collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())){
collectTemp = null;
} }
} }
if (collectVo == null) { if (collectVo == null) {
...@@ -264,6 +266,8 @@ public class GoblinRedisUtils { ...@@ -264,6 +266,8 @@ public class GoblinRedisUtils {
if (collectNext == null || collectNext.getTimeStart().isAfter(collectNext.getTimeStart())) { if (collectNext == null || collectNext.getTimeStart().isAfter(collectNext.getTimeStart())) {
collectNext = collectVoItem; collectNext = collectVoItem;
} }
}else if(collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())){
collectTemp = null;
} }
} }
if (collectVo == null && collectTemp != null) { if (collectVo == null && collectTemp != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment