优化相关策略实现

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/constant/GalaxyErrorEnum.java

@@ -16,7 +16,10 @@ public enum GalaxyErrorEnum {
     PUBLISH_BUY_FAIL("NFT0010004","NFT发行购买失败,未发起购买"),
     PUBLISH_FAIL_ALREADY_EXIST("NFT0010005","NFT发行失败,该订单已经发行过指定nft！"),
     ROUTER_NOT_EXIST("NFT0010006","路由类型不存在"),
-    SERIES_NOT_EXIST("NFT0010007","没有查询到该sku对应系列声明");
+    SERIES_NOT_EXIST("NFT0010007","没有查询到该sku对应系列声明"),
+    SERIES_CLAIM_PROCESSING("NFT0010008","系列声明正在处理中,不允许重复声明！"),
+    SERIES_CLAIM_SUCCESSED("NFT0010009","系列已声明成功，不允许重复声明！"),
+    SERIES_CLAIM_NOT_EXIST("NFT0010010","系列声明初始化信息不存在，请检查是否已上传对应素材！");
 
     private String code;
     private String message;

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

@@ -75,6 +75,15 @@ public class ZxinArtworkBiz {
 
 
     public ResponseDto<GalaxyNftUploadRespDto> nftUpload(GalaxyNftUploadReqDto reqDto) {
+        /**
+         * 系列缓存初始化
+         */
+        //获取任务ID
+        GalaxySeriesInfoBo seriesInfoBo = dataUtils.getSeriesInfoBo(reqDto.getRouterType(),reqDto.getSkuId());
+        if(StringUtil.isNotNull(seriesInfoBo)){
+            return ResponseDto.failure("素材已经上传过！");
+        }
+
         String originalNftUrl = reqDto.getOriginalNftUrl();
         String originalDisplayUrl = reqDto.getOriginalDisplayUrl();
         //上传系列名只用来目录区分
@@ -88,14 +97,7 @@ public class ZxinArtworkBiz {
         galaxyNftUploadRespDto.setDisplayUrl(this.getFullFilePath(seriesName,originalDisplayUrl));
         galaxyNftUploadRespDto.setOriginalDisplayUrl(reqDto.getOriginalDisplayUrl());
 
-        /**
-         * 系列缓存初始化
-         */
-        //获取任务ID
-        GalaxySeriesInfoBo seriesInfoBo = dataUtils.getSeriesInfoBo(reqDto.getRouterType(),reqDto.getSkuId());
-        if(StringUtil.isNotNull(seriesInfoBo)){
-            return ResponseDto.failure("素材已经上传过！");
-        }
+
         seriesInfoBo = this.buildSeriesInfoBo(false,reqDto.getSkuId(),seriesName,null,null,0l
                 ,originalNftUrl,originalDisplayUrl,null,GalaxyEnum.SeriesClaimStatusEnum.SERIES_INIT.getCode()
                 ,null,null,null,null,null,null,null,null,null);
@@ -134,14 +136,13 @@ public class ZxinArtworkBiz {
             /**
              * 如果系列声明成功，则不允许继续声明
              */
-            if(seriesInfoBo.getSeriesClaimStatus().equalsIgnoreCase(GalaxyEnum.SeriesClaimStatusEnum.SUCCESS.getCode())){
-                GalaxyArtSeriesClaimRespDto seriesClaimRespDto = GalaxyArtSeriesClaimRespDto.getNew();
-                seriesClaimRespDto.setSkuId(seriesInfoBo.getSkuId());
-                seriesClaimRespDto.setNftUrl(seriesInfoBo.getNftUrl());
-                seriesClaimRespDto.setSeriesId(seriesInfoBo.getSeriesId());
-                seriesClaimRespDto.setSeriesName(seriesInfoBo.getSeriesName());
-                return ResponseDto.success(seriesClaimRespDto);
+            if(seriesInfoBo.getSeriesClaimStatus().equalsIgnoreCase(GalaxyEnum.SeriesClaimStatusEnum.PROCESSING.getCode())){
+                return ResponseDto.failure(GalaxyErrorEnum.SERIES_CLAIM_PROCESSING.getCode(),GalaxyErrorEnum.SERIES_CLAIM_PROCESSING.getMessage());
+            }else if(seriesInfoBo.getSeriesClaimStatus().equalsIgnoreCase(GalaxyEnum.SeriesClaimStatusEnum.SUCCESS.getCode())){
+                return ResponseDto.failure(GalaxyErrorEnum.SERIES_CLAIM_SUCCESSED.getCode(),GalaxyErrorEnum.SERIES_CLAIM_SUCCESSED.getMessage());
             }
+        }else{
+            return ResponseDto.failure(GalaxyErrorEnum.SERIES_CLAIM_NOT_EXIST.getCode(),GalaxyErrorEnum.SERIES_CLAIM_NOT_EXIST.getMessage());
         }
         /**
          * 进行系列声明
@@ -163,28 +164,30 @@ public class ZxinArtworkBiz {
         String seriesId = null;
         String taskId = null;
         if(nft30RespDto.isSuccess()){
-            //系列声明结果查询
-            Nft031SeriesClaimResultReqDto nft031ReqDto = Nft031SeriesClaimResultReqDto.getNew();
             //第零个系列 无限制系列
             taskId = nft30RespDto.getData().getTaskId();
-            nft031ReqDto.setTaskId(taskId);
         }
 
         GalaxyArtSeriesClaimRespDto seriesClaimRespDto = GalaxyArtSeriesClaimRespDto.getNew();
         seriesClaimRespDto.setSkuId(skuId);
         seriesClaimRespDto.setNftUrl(nftUrl);
+        seriesClaimRespDto.setDisplayUrl(displayUrl);
         seriesClaimRespDto.setSeriesId(seriesId);
         seriesClaimRespDto.setSeriesName(seriesName);
 
         //构造缓存数据
-        if(seriesInfoBo==null){
+        if(StringUtil.isNotNull(seriesInfoBo)){
             //
             String publishStatus = GalaxyEnum.SeriesClaimStatusEnum.PROCESSING.getCode();
+            //设置系列声明状态
+            seriesClaimRespDto.setSeriesClaimStatus(publishStatus);
+
             seriesInfoBo = this.buildSeriesInfoBo(false,skuId,seriesName,seriesId,totalCount,0l
-                    ,null,null,null,publishStatus
+                    ,seriesInfoBo.getOriginalNftUrl(),seriesInfoBo.getOriginalDisplayUrl(),taskId,publishStatus
                     ,author,nftName,nftUrl,displayUrl,nftDesc,nftFlag,sellCount,coverUrl,seriesDesc);
             dataUtils.setSeriesInfoBo(reqDto.getRouterType(),reqDto.getSkuId(),seriesInfoBo);
         }
+
         return ResponseDto.success(seriesClaimRespDto);
     }
 

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

@@ -439,6 +439,8 @@ public class TestZxlnftSdkUtil {
         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("965b5331-f839-4e38-bd62-a62595b39851_nft-series-claim_1"); // 正常
+        reqDto.setTaskId("3c74d453-16fd-4879-a862-e307c1c33564_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");