实现zxtnft购买功能

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/dto/nft/Nft032SeriesResp.java

@@ -35,15 +35,15 @@ public class Nft032SeriesResp implements Serializable {
         /**
          * 总数
          */
-        private String totalCount;
+        private Long totalCount;
         /**
          * 系列下的nftId后缀,是否从0开始，true就是从0开始，默认为false，从1开始
          */
-        private String seriesBeginFromZero;
+        private boolean seriesBeginFromZero;
         /**
          * 当前个数（当前已发行此系列的个数）
          */
-        private String crtCount;
+        private Long crtCount;
         /**
          * 封面图
          */
@@ -55,7 +55,7 @@ public class Nft032SeriesResp implements Serializable {
         /**
          * 创建时间戳
          */
-        private String createTimeStamp;
+        private Long createTimeStamp;
     }
 
     private static final Nft032SeriesResp obj = new Nft032SeriesResp();

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxlnftSdkUtil.java

@@ -416,6 +416,7 @@ public class TestZxlnftSdkUtil {
         reqDto.setTaskId("dc284b01-6110-463a-ac60-8d505f3182d6_nft-series-claim_1");
         reqDto.setTaskId("49d1cccc-e62c-40bc-923c-bfac31325351_nft-series-claim_1");
         reqDto.setTaskId("959842b9-42cf-447a-9fa4-5798ea37bf67_nft-series-claim_1");
+        reqDto.setTaskId("de2e6fcc-58db-47fb-8577-c41eb4beacc6_nft-series-claim_1");
 //        reqDto.setTaskId("b42dbe4c-da91-4644-9f20-7dbfb8f8d41d_nft-series-claim_1");
         //第一个系列 北京草莓音乐节2022主题模型-系列001
 //        reqDto.setTaskId("dc92bbd6-eb95-4452-99f8-0726001367be_nft-series-claim_1");
@@ -429,8 +430,10 @@ public class TestZxlnftSdkUtil {
     @Test
     public void nft032Series(){
         Nft032SeriesReqDto reqDto = Nft032SeriesReqDto.getNew();
-        //第零个系列 无限制系列查询
-        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_8a827e181b695fb8d9b081d3855d2895ced1d003ee186622a005cec37ea77e59");
+        //无限制系列 NOW_ZXL_NFT_PIC_skuId001
+//        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_8a827e181b695fb8d9b081d3855d2895ced1d003ee186622a005cec37ea77e59");
+        //无限制系列 NOW_ZXL_NFT_PIC_skuId002
+        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_b9b105d186742e44691c540bbacddd1c3a883a49d899b81c5b1a5cf10b4ad4e6");
         //第一个系列
 //        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_ca49b5ebadd5f73ab057fe869bf897cbcc0f31e0b89db71cc3ec78bca2d16ed6");
         //第二个系列
@@ -456,10 +459,14 @@ public class TestZxlnftSdkUtil {
 //        }
     }
 
+    /**
+     * ERROR
+     * 该接口没有调试通
+     */
     @Test
     public void nft033SeriesList(){
         Nft033SeriesListReqDto reqDto = Nft033SeriesListReqDto.getNew();
-        reqDto.setAddr("ZXa66c8a684727d0f9aaa434044362aa8a18b61bb4");
+        reqDto.setAddr("zxa66c8a684727d0f9aaa434044362aa8a18b61bb4");
         ZxlnftResponseDto<Nft033SeriesListRespDto> resp = zxlnftSdkUtil.nft033SeriesList(reqDto);
         System.out.println(resp.toJson());
     }
@@ -607,7 +614,7 @@ public class TestZxlnftSdkUtil {
     public void nft040TradeInList(){
         Nft040TradeInListReqDto reqDto = Nft040TradeInListReqDto.getNew();
 //        reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
-        reqDto.setAddr(zhouhuanAddress2);
+        reqDto.setAddr(zhouhuanAddress1);
 //        reqDto.setOffset(0l);
         reqDto.setLimit(1000l);
         ZxlnftResponseDto<Nft040TradeInListRespDto> resp = zxlnftSdkUtil.nft040TradeInList(reqDto);

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxlnftService.java

@@ -170,7 +170,8 @@ public class TestZxlnftService {
     @Test
     public void nftUpload(){
         String imageUrl = "https://zhixinliantest-1302317679.cos.ap-guangzhou.myqcloud.com/nft/4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef/ZXLNFTIMAGE202202241512003609141721.jpg";
-        String seriesName = "NOW_ZXL_NFT_PIC_skuId001"; //系列名字 skuId
+//        String seriesName = "NOW_ZXL_NFT_PIC_skuId001"; //系列名字 skuId
+        String seriesName = "NOW_ZXL_NFT_PIC_skuId002"; //系列名字 skuId
 //        String filePath = "/Users/anjiabin/Downloads/zxl_image_test_002.jpeg";
 //        String filePath = "/Users/anjiabin/Downloads/zxl_image_series_test_001.jpeg";
         String filePath = "/Users/anjiabin/Downloads/zxl_image_test_001.jpg";
@@ -252,23 +253,31 @@ public class TestZxlnftService {
             Nft031SeriesClaimResultReqDto nft031ReqDto = Nft031SeriesClaimResultReqDto.getNew();
             //第零个系列 无限制系列
             nft031ReqDto.setTaskId(nft30RespDto.getData().getTaskId());
-            ZxlnftResponseDto<Nft031SeriesClaimResultRespDto> nft031RespDto = zxlnftSdkUtil.nft031SeriesClaimResult(nft031ReqDto);
-            if(nft031RespDto.isSuccess()){
-                log.info("系列声明结果查询 ：{}",nft031RespDto.toJson());
-                if(nft031RespDto.getData().getTaskStatus().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
-                    seriesId = nft031RespDto.getData().getSeriesId();
-                }
-//                {
-//                    "code": "0",
-//                        "data": {
-//                              "taskStatus": 7,
-//                            "taskMsg": "{\"TraceId\":\"046ed85b-b690-4137-92ce-838d93f693e5\",\"ErrMsg\":\"\",\"Cost\":\"400ms\"}",
-//                            "seriesId": "4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_d55d3746e1a2720345e620c5fbf68515b1d8db284abbda84f202b79260b55a6d",
-//                            "txHash": "f0f3bb9a49f20c0c90b7e58d71f9eeb283e163543a05e4d8d32d0b929835651f",
-//                            "chainTimestamp": 1646386972
-//                      },
-//                    "success": true
-//                }
+
+            int count  = 0;
+            while(StringUtil.isEmpty(seriesId)){
+                //休眠1秒钟，等待执行结果
+                try {
+                    Thread.sleep(1000l);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+
+                count++;
+                log.info("=======执行第{}次查询,taskId:{}",count,nft031ReqDto.getTaskId());
+                ZxlnftResponseDto<Nft031SeriesClaimResultRespDto> nft031RespDtoTemp = zxlnftSdkUtil.nft031SeriesClaimResult(nft031ReqDto);
+                if(nft031RespDtoTemp.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
+                    seriesId = nft031RespDtoTemp.getData().getSeriesId();
+                    break;
+                }else if(nft031RespDtoTemp.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_FAIL.getCode())){
+                    log.info("任务执行失败！taskId:{}",nft031ReqDto.getTaskId());
+                    break;
+                }
+
+                if(count==6){
+                    log.info("=======查询共6次，跳出循环！taskId:{}",nft031ReqDto.getTaskId());
+                    break;
+                }
             }
 
             log.info("系列声明结果查询 seriesId :{}",seriesId);
@@ -300,7 +309,7 @@ public class TestZxlnftService {
         //发行个数
         Long publishCount = 1L;
         //开始索引
-        Integer seriesBeginIndex = 15;
+        Integer seriesBeginIndex = 3;
         Long sellCount = 1000L; //积分
         //无限制系列
         String seriesId = "4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_8a827e181b695fb8d9b081d3855d2895ced1d003ee186622a005cec37ea77e59";
@@ -309,6 +318,21 @@ public class TestZxlnftService {
         //系列002
         //String seriesId = "4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_31ff9f7d4c33c98518e095fec6cecdab8d337751602cf6e651eb7d131cff5b61";
 
+
+        //
+        Nft032SeriesReqDto nft02ReqDto = Nft032SeriesReqDto.getNew();
+        //第零个系列 无限制系列查询
+        nft02ReqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_8a827e181b695fb8d9b081d3855d2895ced1d003ee186622a005cec37ea77e59");
+        //第一个系列
+//        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_ca49b5ebadd5f73ab057fe869bf897cbcc0f31e0b89db71cc3ec78bca2d16ed6");
+        //第二个系列
+//        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_31ff9f7d4c33c98518e095fec6cecdab8d337751602cf6e651eb7d131cff5b61");
+        ZxlnftResponseDto<Nft032SeriesRespDto> resp = zxlnftSdkUtil.nft032Series(nft02ReqDto);
+
+        //该系列已经发行多少个nft
+        Long crtCount = resp.getData().getSeriesInfo().getCrtCount();
+
+
         //3.1.2调用NFT发行接口
         /**
          * 发行无限制系列
@@ -335,6 +359,12 @@ public class TestZxlnftService {
             //3.1.4查询 NFT发行结果
             Nft035PublishResultReqDto nft035ReqDto = Nft035PublishResultReqDto.getNew();
             nft035ReqDto.setTaskId(nft034RespDto.getData().getTaskId());
+            //休眠1秒钟，等待执行结果
+            try {
+                Thread.sleep(1000l);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
             long timeStart = System.currentTimeMillis();
             log.info("=======执行第{}次查询,taskId:{}",1,nft035ReqDto.getTaskId());
             ZxlnftResponseDto<Nft035PublishResultRespDto> nft035RespDto = zxlnftSdkUtil.nft035PublishResult(nft035ReqDto);
@@ -346,19 +376,21 @@ public class TestZxlnftService {
                 }
 
                 int count  = 1;
-                String nftIdBegin = null;
+                String nftIdBegin = nft035RespDto.getData().getNftIdBegin();
 
                 if(nft035RespDto.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.PROCESSING.getCode())){
                     log.info(ZxlnftEnum.TaskStatusEnum.PROCESSING.getMessage());
                     while(StringUtil.isEmpty(nftIdBegin)){
+                        //休眠1秒钟，等待执行结果
                         try {
                             Thread.sleep(1000l);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }
+
                         count++;
-                        log.info("=======执行第{}次查询,taskId:{}",count,nft035ReqDto.getTaskId());
                         ZxlnftResponseDto<Nft035PublishResultRespDto> nft035RespDtoTemp = zxlnftSdkUtil.nft035PublishResult(nft035ReqDto);
+                        log.info("=======执行第{}次查询,taskId:{}",count,nft035ReqDto.getTaskId());
                         if(nft035RespDtoTemp.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
                             nftIdBegin = nft035RespDtoTemp.getData().getNftIdBegin();
                         }else if(nft035RespDtoTemp.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_FAIL.getCode())){
@@ -399,7 +431,7 @@ public class TestZxlnftService {
         Nft043BuyReqDto nft043BuyReqDto = Nft043BuyReqDto.getNew();
 //        reqDto.setNftId("7f73aca56caaf57a20f0afff59318528f0f09ffbf028fe882161d3ce599d2854_1");
 //        nft043BuyReqDto.setNftId("08c152e5fa467d28b7add8e408fb3ecd1ed2ff209364adc1e394bde53929df8f_1");
-        nft043BuyReqDto.setNftId("43c169ae33d2ca5390a49d2319c14223ed5e7447c4b40c0422ef81691ddfee89_2");
+        nft043BuyReqDto.setNftId("43c169ae33d2ca5390a49d2319c14223ed5e7447c4b40c0422ef81691ddfee89_4");
         nft043BuyReqDto.setApplyScore(1000);
         nft043BuyReqDto.setReceiverPubKey(zhouhuanPubKey1);
         nft043BuyReqDto.setPointReceiverAddr(zhouhuanAddress1);
@@ -438,9 +470,18 @@ public class TestZxlnftService {
                         e.printStackTrace();
                     }
                     count++;
+                    log.info("=======执行第{}次查询,taskId:{}",1,nft044ReqDto.getTaskId());
                     ZxlnftResponseDto<Nft044BuyResultRespDto> nft044RespDtoTemp = zxlnftSdkUtil.nft044BuyResult(nft044ReqDto);
                     if(nft044RespDtoTemp.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
                         payTaskId = nft044RespDtoTemp.getData().getPayTaskId();
+                    }else if(nft044RespDtoTemp.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_FAIL.getCode())){
+                        log.info("任务执行失败！taskId:{}",nft044ReqDto.getTaskId());
+                        return;
+                    }
+
+                    if(count==6){
+                        log.info("=======查询共6次，跳出循环！taskId:{}",nft044ReqDto.getTaskId());
+                        break;
                     }
                 }
                 log.info("总共执行了多少次查询：{} 总耗时:{}",count,System.currentTimeMillis() - timeStart);