实现百度链转让

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyQueryNftTradeListReqDto.java

@@ -20,9 +20,9 @@ import java.io.Serializable;
 @ApiModel(value = "GalaxyQueryNftTradeListReqDto", description = "单个NFT交易信息查询")
 @Data
 public class GalaxyQueryNftTradeListReqDto extends GalaxyBaseReqDto implements Serializable,Cloneable{
-    @ApiModelProperty(position = 1, required = true, value = "NFT购买订单ID")
+    @ApiModelProperty(position = 1, required = true, value = "NFTId")
     @NotBlank
-    private String nftOrderPayId;
+    private String nftId;
 
     @Override
     public String toString(){

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyQueryNftTradeListRespDto.java

@@ -61,11 +61,28 @@ public class GalaxyQueryNftTradeListRespDto implements Serializable,Cloneable {
          */
         @ApiModelProperty(position = 1, required = true, value = "链上成交时间")
         private Long dealTimestamp;
+
+        /**
+         * 链上成交时间
+         */
+        @ApiModelProperty(position = 1, required = true, value = "链上成交时间(北京时间)")
+        private String dealTimestampStr;
+
         /**
          * 交易类别， 1:发行 2:购买 3:转移 4:设置价格 5:设置状态
          */
         @ApiModelProperty(position = 1, required = true, value = "交易类别， 1:发行 2:购买 3:转移 4:设置价格 5:设置状态")
         private Integer txType;
+
+        private static final TransInfoDto obj = new TransInfoDto();
+
+        public static TransInfoDto getNew() {
+            try {
+                return (TransInfoDto) obj.clone();
+            } catch (CloneNotSupportedException e) {
+                return new TransInfoDto();
+            }
+        }
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/galaxy/router/xuper/biz/XuperTradeQueryBiz.java

@@ -196,24 +196,64 @@ public class XuperTradeQueryBiz implements IGalaxyRouterStrategyTradeQuery {
 
     public ResponseDto<GalaxyQueryNftTradeListRespDto> queryNftTradeList(GalaxyQueryNftTradeListReqDto reqDto) {
 //        //获取订单信息
-//        GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());
-//        if(StringUtil.isNull(nftOrderBo)){
+//        GalaxyTransferNftInfoBo transferNftInfoBo = dataUtils.getGalaxyTransferNftInfoBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());
+//
+//        if(StringUtil.isNull(transferNftInfoBo)){
 //            return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_ORDER_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_ORDER_NOT_EXIST.getMessage());
 //        }
-//        if(StringUtil.isEmpty(nftOrderBo.getNftId())){
+//        if(StringUtil.isEmpty(transferNftInfoBo.getNftId())){
 //            return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getMessage());
 //        }
-//
-//        Nft039TradeListReqDto nft039TradeListReqDto = Nft039TradeListReqDto.getNew();
-//        nft039TradeListReqDto.setNftId(nftOrderBo.getNftId());
-//        nft039TradeListReqDto.setLimit(1000l);
-//        ZxlnftResponseDto<Nft039TradeListRespDto> zxlnftResponseDto = zxlnftSdkUtil.nft039TradeList(nft039TradeListReqDto);
-//        //查询结果
-//        GalaxyQueryNftTradeListRespDto queryNftTradeListRespDto = GalaxyQueryNftTradeListRespDto.getNew();
-//        if(zxlnftResponseDto.isSuccess()){
-//            BeanUtil.copy(zxlnftResponseDto.getData(),queryNftTradeListRespDto);
-//            return ResponseDto.success(queryNftTradeListRespDto);
-//        }
+
+        Xuper013HistoryReqDto xuper013HistoryReqDto = Xuper013HistoryReqDto.getNew();
+        // 定义返回结果对象
+        Xuper013HistoryRespDto respDto = null;
+        try {
+            //资产id
+            Long assetId = null;
+            //碎片id
+            Long shardId = null;
+            String nftId = reqDto.getNftId();
+
+            if(StringUtil.isNotEmpty(nftId)){
+                assetId = Long.parseLong(nftId.substring(0,nftId.lastIndexOf("_")));
+                shardId = Long.parseLong(nftId.substring(nftId.lastIndexOf("_")+1,nftId.length()));
+            }
+            xuper013HistoryReqDto.setAssetId(assetId);
+            xuper013HistoryReqDto.setShardId(shardId);
+            xuper013HistoryReqDto.setPage(1);
+            xuper013HistoryReqDto.setLimit(50);
+            XuperResponseDto<Xuper013HistoryRespDto>  xuperResponseDto = xuperSdkUtil.xuper013History(xuper013HistoryReqDto);
+            if(xuperResponseDto.isSuccess()){
+                respDto = xuperResponseDto.getParseData(Xuper013HistoryRespDto.class);
+
+                GalaxyQueryNftTradeListRespDto nftTradeListRespDto =GalaxyQueryNftTradeListRespDto.getNew();
+                if(respDto.getList().size()>0){
+                    List<GalaxyQueryNftTradeListRespDto.TransInfoDto> tradeList = new ArrayList<>();
+                    nftTradeListRespDto.setTransList(tradeList);
+                    nftTradeListRespDto.setTotal(Long.parseLong(String.valueOf(respDto.getList().size())));
+                    for(Xuper013HistoryRespDto.History history:respDto.getList()){
+                        GalaxyQueryNftTradeListRespDto.TransInfoDto transInfoDto = GalaxyQueryNftTradeListRespDto.TransInfoDto.getNew();
+                        transInfoDto.setFromAddr(history.getFrom());
+                        transInfoDto.setToAddr(history.getTo());
+                        transInfoDto.setTxType(Integer.parseInt(String.valueOf(history.getType())));
+                        transInfoDto.setTxHash(history.getTxId());
+                        LocalDateTime tradeTime = DateUtil.ofEpochMilli(history.getCtime());
+                        transInfoDto.setDealTimestamp(history.getCtime());
+                        transInfoDto.setDealTimestampStr(DateUtil.format(tradeTime, DateUtil.Formatter.yyyyMMddHHmmss));
+                        nftTradeListRespDto.getTransList().add(transInfoDto);
+                    }
+                }
+                return ResponseDto.success(nftTradeListRespDto);
+            }else{
+                return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getMessage()+"nftId:"+nftId);
+            }
+        }catch (XupterException e) {
+            log.error("biz error msg "+e.getMessage(),e);
+        }catch (Exception e) {
+            log.error("sys error msg "+e.getMessage(),e);
+        }
+        log.info("testXuper013History resp : "+ JsonUtils.toJson(respDto));
         return ResponseDto.failure();
     }
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinTradeQueryBiz.java

@@ -73,17 +73,17 @@ public class ZxinTradeQueryBiz implements IGalaxyRouterStrategyTradeQuery {
 
     @Override
     public ResponseDto<GalaxyQueryNftTradeListRespDto> queryNftTradeList(GalaxyQueryNftTradeListReqDto reqDto) {
-        //获取订单信息
-        GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());
-        if(StringUtil.isNull(nftOrderBo)){
-            return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_ORDER_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_ORDER_NOT_EXIST.getMessage());
-        }
-        if(StringUtil.isEmpty(nftOrderBo.getNftId())){
-            return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getMessage());
-        }
+//        //获取订单信息
+//        GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.());
+//        if(StringUtil.isNull(nftOrderBo)){
+//            return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_ORDER_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_ORDER_NOT_EXIST.getMessage());
+//        }
+//        if(StringUtil.isEmpty(nftOrderBo.getNftId())){
+//            return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getMessage());
+//        }
 
         Nft039TradeListReqDto nft039TradeListReqDto = Nft039TradeListReqDto.getNew();
-        nft039TradeListReqDto.setNftId(nftOrderBo.getNftId());
+        nft039TradeListReqDto.setNftId(reqDto.getNftId());
         nft039TradeListReqDto.setLimit(1000l);
         ZxlnftResponseDto<Nft039TradeListRespDto> zxlnftResponseDto = zxlnftSdkUtil.nft039TradeList(nft039TradeListReqDto);
         //查询结果