藏品列表详情vo

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftGoodsSkuInfoVo.java

@@ -24,8 +24,6 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
     private String skuId;
     @ApiModelProperty(position = 11, value = "商品ID[64]")
     private String spuId;
-    @ApiModelProperty(position = 12, value = "单品的编号[45]")
-    private String skuNo;
     @ApiModelProperty(position = 13, value = "单品的名称[100]")
     private String name;
     @ApiModelProperty(position = 14, value = "单品的副标题[128]")
@@ -35,85 +33,41 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 15, value = "单品详情展示文件URL[256]")
     private String skuWatch;
 
+    @ApiModelProperty(position = 18, value = "单品库存")
+    private Integer skuStock;
+
     @ApiModelProperty(position = 20, value = "单品销售价-原价[20,2]")
     private BigDecimal sellPrice;
     @ApiModelProperty(position = 21, value = "单品现价[20,2]")
     private BigDecimal price;
-    @ApiModelProperty(position = 22, value = "单品会员价格[20,2]")
-    private BigDecimal priceMember;
 
     @ApiModelProperty(position = 23, value = "单品简介[256]", example = "单品简介...")
     private String intro;
     @ApiModelProperty(position = 23, value = "单品详情", example = "单品详情...")
     private String details;
 
-    @ApiModelProperty(position = 24, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
-    private String buyFactor;
-    @ApiModelProperty(position = 25, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
-    private String buyRoster;
-    @ApiModelProperty(position = 26, value = "限量[0-无限制|X:限购数量]")
+    @ApiModelProperty(position = 26, value = "限量 0无限制 X限购数量")
     private Integer buyLimit;
 
-    @ApiModelProperty(position = 27, value = "商品的店铺ID，如果是平台的则为0")
-    private String storeId;
-
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     @ApiModelProperty(position = 27, value = "开售时间")
     private LocalDateTime saleStartTime;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     @ApiModelProperty(position = 27, value = "停售时间")
     private LocalDateTime saleStopTime;
-    @ApiModelProperty(position = 28, value = "单品有效期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime skuValidity;
-
-    @ApiModelProperty(position = 30, value = "审核状态[0-初始编辑|1-审核中|2-审核不通过|3-审核通过]")
-    private String status;
-    @ApiModelProperty(position = 32, value = "单品上架状态[0-待上架|1-下架|2-违规|3-上架]")
-    private String shelvesStatus;
 
     @ApiModelProperty(position = 33, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
     private String skuAppear;
 
-    @ApiModelProperty(position = 33, value = "是否盲盒[0-否|1-是]")
-    private String unbox;
-    @ApiModelProperty(position = 33, value = "盲盒开启时间")
-    private LocalDateTime openingTime;
-    @ApiModelProperty(position = 33, value = "盲盒开启时限[单位秒]")
-    private Integer openingLimit;
-
-    @ApiModelProperty(position = 33, value = "NFT路由")
-    private String routeType;
-    @ApiModelProperty(position = 33, value = "NFT上传声明状态[0-待上传|1-已上传|2-上传失败|9-上传中]")
-    private Integer upchain;
-    @ApiModelProperty(position = 33, value = "NFT预览图访问URL")
-    private String displayUrl;
-    @ApiModelProperty(position = 33, value = "NFT素材访问URL")
-    private String nftUrl;
-    @ApiModelProperty(position = 33, value = "NFT系列ID")
-    private String seriesId;
-    @ApiModelProperty(position = 33, value = "NFT系列HASH")
-    private String seriesHash;
-    @ApiModelProperty(position = 33, value = "NFT藏品HASH")
-    private String nftHash;
-    @ApiModelProperty(position = 33, value = "NFT系列声明时间")
-    private String declareAt;
-
-    @ApiModelProperty(position = 35, value = "上架时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime shelvesAt;
-
-    @ApiModelProperty(position = 40, value = "单品规格信息")
-    private List<GoblinGoodsSpecDto> skuSpecList;
     @ApiModelProperty(position = 54, value = "单品音乐人标签[藏品类型时使用]")
     private List<GoblinGoodsExtagVo> extagVoList;
 
     @ApiModelProperty(position = 55, value = "spu相关信息")
     private GoblinNftGoodsSpuInfoVo goblinNftGoodsSpuInfoVo;
 
-    @ApiModelProperty(position = 56, value = "是否还有库存 0没有库存 1有库存")
+    @ApiModelProperty(position = 56, value = "是否还有库存 0没有库存 1有库存 即售罄")
     private int isStock;
-    @ApiModelProperty(position = 57, value = "还可以购买数量")
+    @ApiModelProperty(position = 57, value = "当前用户还可以购买数量 有限购的时候用")
     private int canBuyNum;
 
     private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftGoodsSpuInfoVo.java

@@ -22,11 +22,6 @@ public class GoblinNftGoodsSpuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 37, value = "发行方")
     private String publisher;
 
-    @ApiModelProperty(position = 61, value = "销量")
-    private Integer count;
-    @ApiModelProperty(position = 62, value = "商铺名称")
-    private String storeName;
-
     private static final GoblinNftGoodsSpuInfoVo obj = new GoblinNftGoodsSpuInfoVo();
 
     public static GoblinNftGoodsSpuInfoVo getNew() {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftGoodsAppServiceImpl.java

@@ -54,8 +54,9 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
         List<GoblinNftGoodsSkuInfoVo> skuList = goblinRedisUtils.getGoblinNftGoodsInfoListVo();
         if (null == skuList || page > 1) {
             skuList = new ArrayList<>();
-            // 排序 分页
-            Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
+            // 分页 排序:按照开售时间
+            // TODO: jxl 2022/3/30 售罄放后面
+            Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "saleStartTime"));
             query.with(pageable);
 
             List<GoblinGoodsSkuInfoVo> skuInfoVos = mongoTemplate.find(query, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
@@ -73,6 +74,14 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
                 goblinRedisUtils.setGoblinNftGoodsInfoListVo(skuList);
             }
         }
+        for (GoblinNftGoodsSkuInfoVo skuInfoVo : skuList) {
+            int stock = goblinRedisUtils.getSkuStock(null, skuInfoVo.getSkuId());
+            if (stock <= 0) {
+                skuInfoVo.setIsStock(0);
+            } else {
+                skuInfoVo.setIsStock(1);
+            }
+        }
         PageInfo<GoblinNftGoodsSkuInfoVo> pageInfo = new PageInfo(skuList);
         pageInfo.setTotal(count);
         pageInfo.setPageSize(size);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -538,7 +538,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             sqls.add(SqlMapping.get("goblin_nft_order_refund.refund"));
             String orderId = nftOrderRefundVo.getOrderId();
             GoblinNftOrderVo nftOrder = nftOrderUtils.getNftOrder(orderId);
-            //整单退款 退券
             nftOrder.setStatus(GoblinStatusConst.NftStatus.ORDER_STATUS_5.getValue());
             /*if (StringUtil.isNotEmpty(nftOrder.getUcouponId())) {
                 goblinOrderUtils.backCoupon(nftOrder.getUcouponId(), nftOrder.getUserId());
@@ -573,6 +572,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             //减积分
             goblinOrderUtils.desTask(nftOrder.getUserId(), nftOrderRefundVo.getRealBackPrice());
         } else if (0 == status) {
+            log.info("NftRefundCallback: 支付平台返回状态为失败，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";
         }
         return "success";