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

Skip to content

L
liquidnet-bus-v1
Commit 8647af06 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

修改 todo 逻辑修改 开售时间

parent e40361af
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
View file @ 8647af06
...@@ -832,6 +832,9 @@ public class GoblinRedisUtils { ...@@ -832,6 +832,9 @@ public class GoblinRedisUtils {
GoblinListCollectVo collectNext = getCollectByNowNext(now, skuId); GoblinListCollectVo collectNext = getCollectByNowNext(now, skuId);
if (collectNext != null) { if (collectNext != null) {
tagType = collectNext.getTagType(); tagType = collectNext.getTagType();
//todo 逻辑修改 开售时间
vo.setSaleStartTime(collectNext.getTimeStart());
vo.setSaleStopTime(collectNext.getTimeEnd());
} }
map.put("vo", vo); map.put("vo", vo);
map.put("tagType", tagType); map.put("tagType", tagType);
...@@ -861,7 +864,7 @@ public class GoblinRedisUtils { ...@@ -861,7 +864,7 @@ 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())){ } else if (collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())) {
collectTemp = null; collectTemp = null;
} }
} }
...@@ -891,7 +894,7 @@ public class GoblinRedisUtils { ...@@ -891,7 +894,7 @@ 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())){ } else if (collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())) {
collectTemp = null; collectTemp = null;
} }
} }
...@@ -935,7 +938,7 @@ public class GoblinRedisUtils { ...@@ -935,7 +938,7 @@ 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())){ } else if (collectVoItem.getTimeEnd() != null && now.isAfter(collectVoItem.getTimeEnd())) {
collectTemp = null; collectTemp = null;
} }
} }
...@@ -959,7 +962,7 @@ public class GoblinRedisUtils { ...@@ -959,7 +962,7 @@ public class GoblinRedisUtils {
if (vo == null && type == 0) {//已开售逻辑 if (vo == null && type == 0) {//已开售逻辑
for (GoblinListCollectVo collectVoItem : collectVos) { for (GoblinListCollectVo collectVoItem : collectVos) {
int lastStock = getSkuStock(collectVoItem.getListId(), skuId); int lastStock = getSkuStock(collectVoItem.getListId(), skuId);
log.debug("all stock = "+lastStock); log.debug("all stock = " + lastStock);
int restStock = decrSkuStock(collectVoItem.getListId(), skuId, lastStock); int restStock = decrSkuStock(collectVoItem.getListId(), skuId, lastStock);
if (restStock < 0) { if (restStock < 0) {
incrSkuStock(collectVoItem.getListId(), skuId, lastStock); incrSkuStock(collectVoItem.getListId(), skuId, lastStock);
...@@ -1004,7 +1007,7 @@ public class GoblinRedisUtils { ...@@ -1004,7 +1007,7 @@ public class GoblinRedisUtils {
for (GoblinListCollectVo itemVo : collectVosList) { for (GoblinListCollectVo itemVo : collectVosList) {
//减少上个时间段sku库存 //减少上个时间段sku库存
int lastStock = getSkuStock(itemVo.getListId(), skuId); int lastStock = getSkuStock(itemVo.getListId(), skuId);
log.debug("temp stock = "+lastStock); log.debug("temp stock = " + lastStock);
int restStock = decrSkuStock(itemVo.getListId(), skuId, lastStock); int restStock = decrSkuStock(itemVo.getListId(), skuId, lastStock);
if (restStock < 0) { if (restStock < 0) {
//库存超过销售量 操作失败回滚库存 //库存超过销售量 操作失败回滚库存
...@@ -1991,6 +1994,7 @@ public class GoblinRedisUtils { ...@@ -1991,6 +1994,7 @@ public class GoblinRedisUtils {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_GOODS_LIST_INFO.concat(skuId); String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_GOODS_LIST_INFO.concat(skuId);
redisUtil.set(redisKey, data); redisUtil.set(redisKey, data);
} }
public GoblinNftGoodsSkuListVo getGoblinNftGoodsListInfoVo(String skuId) { public GoblinNftGoodsSkuListVo getGoblinNftGoodsListInfoVo(String skuId) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_GOODS_LIST_INFO.concat(skuId); String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_GOODS_LIST_INFO.concat(skuId);
Object obj = redisUtil.get(redisKey); Object obj = redisUtil.get(redisKey);
...@@ -2025,6 +2029,7 @@ public class GoblinRedisUtils { ...@@ -2025,6 +2029,7 @@ public class GoblinRedisUtils {
return (GoblinUserNftAccInfoVo) obj; return (GoblinUserNftAccInfoVo) obj;
} }
} }
public void setOpenAccountInfo(String userId, GoblinUserNftAccInfoVo nftAccInfoVo) { public void setOpenAccountInfo(String userId, GoblinUserNftAccInfoVo nftAccInfoVo) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_NUM_ACCOUNT_INFO.concat(userId); String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_NUM_ACCOUNT_INFO.concat(userId);
redisUtil.set(redisKey, nftAccInfoVo); redisUtil.set(redisKey, nftAccInfoVo);
......
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