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

Commit 77c2e6d7 authored by 胡佳晨's avatar 胡佳晨

nft 列表 nft详情 组合购详情 增加在什么链 转赠时间单位[秒]

parent bc74d488
......@@ -41,6 +41,10 @@ public class GoblinMixDetailsItemVo implements Serializable, Cloneable {
private String productId;
@ApiModelProperty(value = "组合件数[数字藏品不能大于1]")
private Integer count;
@ApiModelProperty(value = "NFT路由[zxinchain-至信链|xuper-百度超级链]")
private String routeType;
@ApiModelProperty(value = "转赠时间[单位秒]")
private Long transferTimeLimit;
private static final GoblinMixDetailsItemVo obj = new GoblinMixDetailsItemVo();
......
......@@ -120,6 +120,11 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
@ApiModelProperty(position = 74, value = "第一个分批购结束时间")
private LocalDateTime firstSaleEndTime;
@ApiModelProperty(position = 75, value = "NFT路由[zxinchain-至信链|xuper-百度超级链]")
private String routeType;
@ApiModelProperty(position = 76, value = "转赠时间[单位秒]")
private Long transferTimeLimit;
private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();
public static GoblinNftGoodsSkuInfoVo getNew() {
......
......@@ -52,6 +52,10 @@ public class GoblinNftGoodsSkuListVo implements Serializable, Cloneable {
private Integer state;
@ApiModelProperty(position = 62, value = "标签[0-提前购买|1-分段购买]")
private Integer tagType;
@ApiModelProperty(position = 63, value = "NFT路由[zxinchain-至信链|xuper-百度超级链]")
private String routeType;
@ApiModelProperty(position = 64, value = "转赠时间[单位秒]")
private Long transferTimeLimit;
private static final GoblinNftGoodsSkuListVo obj = new GoblinNftGoodsSkuListVo();
......
......@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
......@@ -87,14 +88,34 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
item.setStock(0);
item.setSkuName(skuInfoVo.getName());
item.setSpuName(spuInfoVo.getName());
String routeType = "";
if (skuInfoVo.getUnbox().equals("1")) {
List<String> relationIds = redisUtils.getGoblinMixRelationBox(item.getSkuId(), vo.getMixId());
for (String skuId : relationIds) {
stock += redisUtils.getSkuStock(vo.getMixId(), skuId);
}
for (String routeSkuId : spuInfoVo.getSkuIdList()) {
if ("".equals(routeType)) {
routeType = redisUtils.getGoodsSkuInfoVo(routeSkuId).getRouteType();
} else {
break;
}
}
} else {
stock += redisUtils.getSkuStock(vo.getMixId(), item.getSkuId());
routeType = skuInfoVo.getRouteType();
}
//转赠时间
if(skuInfoVo.getSkuType()==1) {
Map<String, Long> artworkTransferConfMap = redisUtils.getUserDigitalArtworkTransferConfMap();
item.setRouteType(routeType);
item.setTransferTimeLimit(artworkTransferConfMap.get(routeType));
}else{
item.setRouteType("");
item.setTransferTimeLimit(0L);
}
}
if (stock == 0) {
vo.setStatus(8);
......
......@@ -21,6 +21,7 @@ import java.time.LocalDateTime;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
......@@ -75,14 +76,32 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
GoblinNftGoodsSkuListVo goblinNftGoodsSkuListVo = GoblinNftGoodsSkuListVo.getNew().copy(skuInfoVo);
// spu信息
Object spuInfoMap = spuInfoList.get(skuInfoVo.getSpuId());
if (null == spuInfoMap) {
GoblinGoodsInfoVo goodsInfoVo = goblinRedisUtils.getGoodsInfoVo(skuInfoVo.getSpuId());
if (null == spuInfoMap) {
GoblinNftGoodsSpuInfoVo nftGoodsSpuInfoVo = GoblinNftGoodsSpuInfoVo.getNew().copy(goodsInfoVo);
spuInfoList.put(skuInfoVo.getSpuId(), nftGoodsSpuInfoVo);
goblinNftGoodsSkuListVo.setGoblinNftGoodsSpuInfoVo(nftGoodsSpuInfoVo);
} else {
goblinNftGoodsSkuListVo.setGoblinNftGoodsSpuInfoVo((GoblinNftGoodsSpuInfoVo) spuInfoMap);
}
// 链
String routeType = "";
if (skuInfoVo.getUnbox().equals("1")) {
for (String routeSkuId : goodsInfoVo.getSkuIdList()) {
if ("".equals(routeType)) {
routeType = goblinRedisUtils.getGoodsSkuInfoVo(routeSkuId).getRouteType();
} else {
break;
}
}
} else {
routeType = skuInfoVo.getRouteType();
}
//转赠时间
Map<String, Long> artworkTransferConfMap = goblinRedisUtils.getUserDigitalArtworkTransferConfMap();
goblinNftGoodsSkuListVo.setRouteType(routeType);
goblinNftGoodsSkuListVo.setTransferTimeLimit(artworkTransferConfMap.get(routeType));
// 库存、预约
if (soldOutSkuIdList.contains(skuId)) {// 是售罄的
goblinNftGoodsSkuListVo.setIsStock(0);
......@@ -176,10 +195,25 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
// 库存
HashMap<String, Integer> stockHashMap = goblinOrderUtils.getIsStock(listId, skuId, skuInfoVo.getUnbox(), skuInfoVo.getSoldoutStatus(), goodsInfoVo.getSkuIdList());
nftGoodsSkuInfoVo.setIsStock(stockHashMap.get("isStock"));
// 总库存
// 总库存&链
String routeType = "";
if (skuInfoVo.getUnbox().equals("1")) {
nftGoodsSkuInfoVo.setSkuStock(stockHashMap.get("totalStock"));
for (String routeSkuId : goodsInfoVo.getSkuIdList()) {
if ("".equals(routeType)) {
routeType = goblinRedisUtils.getGoodsSkuInfoVo(routeSkuId).getRouteType();
} else {
break;
}
}
} else {
routeType = skuInfoVo.getRouteType();
}
//转赠时间
Map<String, Long> artworkTransferConfMap = goblinRedisUtils.getUserDigitalArtworkTransferConfMap();
nftGoodsSkuInfoVo.setRouteType(routeType);
nftGoodsSkuInfoVo.setTransferTimeLimit(artworkTransferConfMap.get(routeType));
// 系统时间
nftGoodsSkuInfoVo.setSystime(LocalDateTime.now());
nftGoodsSkuInfoVo.setTagType(tagType);
......
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