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

Commit b23ebabf authored by jiangxiulong's avatar jiangxiulong

设计抽奖、商品列表、商品详情;盲盒内sku概率设置为0即为不允许中,不算库存

parent 6e17da6a
...@@ -22,6 +22,7 @@ import org.springframework.stereotype.Component; ...@@ -22,6 +22,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -1640,6 +1641,7 @@ public class GoblinRedisUtils { ...@@ -1640,6 +1641,7 @@ public class GoblinRedisUtils {
info != null info != null
&& LocalDateTime.now().isAfter(info.getSaleStartTime()) && LocalDateTime.now().isAfter(info.getSaleStartTime())
&& (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0")) && (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0"))
&& (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
) {// 可以返回库存 ) {// 可以返回库存
return getSkuStock(null, info.getSkuId()); return getSkuStock(null, info.getSkuId());
} else {// 不计入库存 } else {// 不计入库存
......
...@@ -217,8 +217,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -217,8 +217,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
if (skuInfoVo.getUnbox().equals("1")) { if (skuInfoVo.getUnbox().equals("1")) {
continue; continue;
} }
// 不能购买的 没库存的过滤 // 不能购买的 没库存的 概率是0的 过滤
if (nftOrderUtils.getSkuAllStatusShow(skuInfoVo) && nftOrderUtils.getSkuAllStatusStock(skuInfoVo) > 0) { if (nftOrderUtils.getSkuHitRatio(skuInfoVo.getHitRatio()) && nftOrderUtils.getSkuAllStatusShow(skuInfoVo) && nftOrderUtils.getSkuAllStatusStock(skuInfoVo) > 0) {
skuInfoVos.add(skuInfoVo); skuInfoVos.add(skuInfoVo);
} }
} }
...@@ -229,7 +229,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -229,7 +229,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
int size = 0; int size = 0;
BigDecimal sumHitRatio = BigDecimal.ZERO; BigDecimal sumHitRatio = BigDecimal.ZERO;
for (GoblinGoodsSkuInfoVo skuInfoVo : skuInfoVos) { for (GoblinGoodsSkuInfoVo skuInfoVo : skuInfoVos) {
if (null == skuInfoVo.getHitRatio() || skuInfoVo.getHitRatio().compareTo(BigDecimal.ZERO) <= 0) { if (null == skuInfoVo.getHitRatio()) {
size++; size++;
} else { } else {
sumHitRatio = sumHitRatio.add(skuInfoVo.getHitRatio()); sumHitRatio = sumHitRatio.add(skuInfoVo.getHitRatio());
......
...@@ -374,4 +374,12 @@ public class GoblinNftOrderUtils { ...@@ -374,4 +374,12 @@ public class GoblinNftOrderUtils {
return false; return false;
} }
} }
// 根据概率判断是否过滤当前sku
public boolean getSkuHitRatio(BigDecimal hitRatio) {
if (hitRatio == null || hitRatio.compareTo(BigDecimal.ZERO) > 0) {
return true;
} else {
return false;
}
}
} }
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