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

Commit d4746f1f authored by jiangxiulong's avatar jiangxiulong

nowTime 可能没用

parent 51380b45
...@@ -76,7 +76,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -76,7 +76,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
return ResponseDto.failure("此数字藏品仅限预约用户购买~"); return ResponseDto.failure("此数字藏品仅限预约用户购买~");
} }
// 是否存在此商品信息 是否隐藏
// 基础参数 // 基础参数
String mobile = StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE)), ""); String mobile = StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE)), "");
String skuId = payParam.getSkuId(); String skuId = payParam.getSkuId();
...@@ -152,7 +151,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -152,7 +151,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
if (CollectionUtil.isEmpty(skuIdList)) { if (CollectionUtil.isEmpty(skuIdList)) {
return ResponseDto.failure("该商品SPU不存在~"); return ResponseDto.failure("该商品SPU不存在~");
} else { } else {
HashMap<String, Object> lotteryDrawMap = lotteryDraw(skuIdList, number); HashMap<String, Object> lotteryDrawMap = lotteryDraw(skuIdList, number, nowTime);
GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) lotteryDrawMap.get("goodsSkuInfoVo"); GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) lotteryDrawMap.get("goodsSkuInfoVo");
if (null == skuInfoVo) { if (null == skuInfoVo) {
goblinRedisUtils.decrSkuCountByUid(uid, skuId, number); goblinRedisUtils.decrSkuCountByUid(uid, skuId, number);
...@@ -231,13 +230,12 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -231,13 +230,12 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
} }
} }
private HashMap<String, Object> lotteryDraw(List<String> skuIdList, int number) { private HashMap<String, Object> lotteryDraw(List<String> skuIdList, int number, LocalDateTime nowTime) {
LocalDateTime now = LocalDateTime.now();
try { try {
ArrayList<GoblinGoodsSkuInfoVo> skuInfoVos = ObjectUtil.cloneArrayGoblinGoodsSkuInfoListVo(); ArrayList<GoblinGoodsSkuInfoVo> skuInfoVos = ObjectUtil.cloneArrayGoblinGoodsSkuInfoListVo();
ArrayList<String> listIds = ObjectUtil.cloneArrayListString(); ArrayList<String> listIds = ObjectUtil.cloneArrayListString();
for (String kid : skuIdList) { for (String kid : skuIdList) {
HashMap<String, Object> map = goblinRedisUtils.getGoodsSkuInfoVo(now, kid); HashMap<String, Object> map = goblinRedisUtils.getGoodsSkuInfoVo(nowTime, kid);
GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) map.get("vo"); GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) map.get("vo");
String listId = (String) map.get("listId"); String listId = (String) map.get("listId");
// 是盲盒的扔掉 // 是盲盒的扔掉
...@@ -323,7 +321,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -323,7 +321,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
int surplusGeneral = goblinRedisUtils.decrSkuStock(endListId, goodsSkuInfoVo.getSkuId(), number); int surplusGeneral = goblinRedisUtils.decrSkuStock(endListId, goodsSkuInfoVo.getSkuId(), number);
if (surplusGeneral < 0) { if (surplusGeneral < 0) {
goblinRedisUtils.incrSkuStock(endListId, goodsSkuInfoVo.getSkuId(), number); goblinRedisUtils.incrSkuStock(endListId, goodsSkuInfoVo.getSkuId(), number);
return lotteryDraw(skuIdList, number); return lotteryDraw(skuIdList, number, nowTime);
} else { } else {
HashMap<String, Object> map = CollectionUtil.mapStringObject(); HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("goodsSkuInfoVo", goodsSkuInfoVo); map.put("goodsSkuInfoVo", goodsSkuInfoVo);
......
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