Merge remote-tracking branch 'origin/dev_nft' into dev_nft

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

@@ -61,7 +61,7 @@ public class GoblinNftOrderDetailsVo implements Serializable, Cloneable {
     private LocalDateTime createdAt;
 
     @ApiModelProperty(value = "商品信息")
-    GoblinNftGoodsSkuInfoVo goodsSkuInfoVo;
+    GoblinNftOrderGoodsSkuInfoVo goodsSkuInfoVo;
 
     private static final GoblinNftOrderDetailsVo obj = new GoblinNftOrderDetailsVo();
 

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinNftOrderGoodsSkuInfoVo", description = "NFT订单中商品SKU信息")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinNftOrderGoodsSkuInfoVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -519573757075729441L;
+
+    @ApiModelProperty(position = 10, value = "商品单品ID")
+    private String skuId;
+    @ApiModelProperty(position = 11, value = "商品ID[64]")
+    private String spuId;
+    @ApiModelProperty(position = 13, value = "单品的名称[100]")
+    private String name;
+    @ApiModelProperty(position = 14, value = "单品的副标题[128]")
+    private String subtitle;
+    @ApiModelProperty(position = 15, value = "单品详情展示文件URL[256]")
+    private String skuWatch;
+    @ApiModelProperty(position = 15, value = "展示文件类型[1-图片|2-视频|3-模型]")
+    private String watchType;
+
+    private static final GoblinNftOrderGoodsSkuInfoVo obj = new GoblinNftOrderGoodsSkuInfoVo();
+
+    public static GoblinNftOrderGoodsSkuInfoVo getNew() {
+        try {
+            return (GoblinNftOrderGoodsSkuInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinNftOrderGoodsSkuInfoVo();
+        }
+    }
+
+    public GoblinNftOrderGoodsSkuInfoVo copy(GoblinGoodsSkuInfoVo source) {
+        if (null == source) return this;
+        this.setSkuId(source.getSkuId());
+        this.setSpuId(source.getSpuId());
+        this.setName(source.getName());
+        this.setSubtitle(source.getSubtitle());
+        this.setSkuWatch(source.getSkuWatch());
+        this.setWatchType(source.getWatchType());
+        return this;
+    }
+}

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

 package com.liquidnet.service.goblin.service.impl;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinNftGoodsSkuInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftOrderDetailsVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinNftOrderGoodsSkuInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftOrderVo;
 import com.liquidnet.service.goblin.service.IGoblinNftOrderAppService;
 import com.liquidnet.service.goblin.util.*;
@@ -52,13 +51,11 @@ public class GoblinNftOrderAppServiceImpl implements IGoblinNftOrderAppService {
             GoblinNftOrderDetailsVo orderDetails = GoblinNftOrderDetailsVo.getNew().copy(orderVo);
             // 商品信息
             GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(orderVo.getSkuId());
-            GoblinNftGoodsSkuInfoVo nftGoodsSkuInfoVo = GoblinNftGoodsSkuInfoVo.getNew().copy(goodsSkuInfoVo);
+            GoblinNftOrderGoodsSkuInfoVo nftGoodsSkuInfoVo = GoblinNftOrderGoodsSkuInfoVo.getNew().copy(goodsSkuInfoVo);
             orderDetails.setGoodsSkuInfoVo(nftGoodsSkuInfoVo);
             // 加入列表
             orderVoList.add(orderDetails);
         }
-        PageInfo<GoblinNftOrderDetailsVo> pageInfo = new PageInfo(orderVoList);
-        pageInfo.setTotal(orderIds.size());
 
         PagedResult<GoblinNftOrderDetailsVo> listVoPagedResult = ObjectUtil.getGoblinNftOrderDetailsVoPagedResult();
         listVoPagedResult.setList(orderVoList).setTotal(orderIds.size(), size).setPageSize(size).setCurrentPage(page);
@@ -81,7 +78,7 @@ public class GoblinNftOrderAppServiceImpl implements IGoblinNftOrderAppService {
         orderDetails.setOrderCode(orderDetails.getOrderCode().substring(orderDetails.getOrderCode().length() - 10));
         // 商品信息
         GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(orderVo.getSkuId());
-        GoblinNftGoodsSkuInfoVo nftGoodsSkuInfoVo = GoblinNftGoodsSkuInfoVo.getNew().copy(goodsSkuInfoVo);
+        GoblinNftOrderGoodsSkuInfoVo nftGoodsSkuInfoVo = GoblinNftOrderGoodsSkuInfoVo.getNew().copy(goodsSkuInfoVo);
         orderDetails.setGoodsSkuInfoVo(nftGoodsSkuInfoVo);
 
         return ResponseDto.success(orderDetails);