nft修改购买异常逻辑

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

@@ -28,7 +28,8 @@ public enum GalaxyErrorEnum {
     NFT_BUY_FAIL_USER_NOT_EXIST("NFT0010015","NFT购买失败，用户信息不存在!"),
     NFT_BUY_FAIL_SERIES_NFT_NOT_EXIST("NFT0010016","NFT购买失败，系列NFT信息不存在!"),
     NFT_PUBLISH_ERROR("NFT0010017","NFT发行异常!"),
-    NFT_BUY_ERROR("NFT0010018","NFT购买异常!");
+    NFT_BUY_ERROR("NFT0010018","NFT购买异常!"),
+    NFT_PUBLISH_AND_BUY_QUERY_FAIL("NFT0010019","NFT发行和购买结果查询失败!");
 
 
     private String code;

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

@@ -146,12 +146,17 @@ public class ZxinTradeBiz {
             return ResponseDto.failure(GalaxyErrorEnum.PUBLISH_ORDER_NOT_EXIST.getCode(), GalaxyErrorEnum.PUBLISH_ORDER_NOT_EXIST.getMessage());
         }
 
+
         /**
          * TODO 如果订单信息是购买失败，则直接调用至信链查询购买结果
          */
         if(StringUtil.isNotEmpty(nftOrderBo.getNftPublishStatus())
                 && (GalaxyEnum.TaskStatusEnum.INIT.getCode().equalsIgnoreCase(nftOrderBo.getNftPublishStatus())
                 ||GalaxyEnum.TaskStatusEnum.PROCESSING.getCode().equalsIgnoreCase(nftOrderBo.getNftPublishStatus()))){
+            //判断是否需要二次发行
+            if(StringUtil.isEmpty(nftOrderBo.getNftPublishTaskId())){
+
+            }
             //执行nft发行结果查询
             GalaxyNftPublishResultQueryReqDto nftPublishResultQueryReqDto = GalaxyNftPublishResultQueryReqDto.getNew();
             nftPublishResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId());
@@ -165,6 +170,10 @@ public class ZxinTradeBiz {
         if(StringUtil.isNotEmpty(nftOrderBo.getNftBuyStatus())
                 && (GalaxyEnum.TaskStatusEnum.INIT.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus())
                 ||GalaxyEnum.TaskStatusEnum.PROCESSING.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus()))){
+            //判断是否需要二次购买
+            if(StringUtil.isEmpty(nftOrderBo.getNftBuyTaskId())){
+
+            }
             //执行nft购买结果查询
             GalaxyNftBuyResultQueryReqDto nftBuyResultQueryReqDto = GalaxyNftBuyResultQueryReqDto.getNew();
             nftBuyResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId());
@@ -177,9 +186,13 @@ public class ZxinTradeBiz {
         }
 
         GalaxyNftPublishAndBuyResultQueryRespDto resultQueryRespDto = GalaxyNftPublishAndBuyResultQueryRespDto.getNew();
+        if(nftOrderBo.getNftPublishStatus().equalsIgnoreCase(GalaxyEnum.TaskStatusEnum.TASK_SUCCESS.getCode())&&
+                nftOrderBo.getNftBuyStatus().equalsIgnoreCase(GalaxyEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
             BeanUtil.copy(nftOrderBo,resultQueryRespDto);
             return ResponseDto.success(resultQueryRespDto);
         }
+        return ResponseDto.failure(GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getCode(),GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getMessage(),resultQueryRespDto);
+    }
 
     /**
      * NFT发行和购买批量查询

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

@@ -50,7 +50,7 @@ public class TestZxlnftSdkUtil {
     public static String zhouhuanPriKey1 = "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgjSDapAU4gujWk9mM\nCE1tOokocdKrHMkfvZ0vfaWM+MOgCgYIKoEcz1UBgi2hRANCAAREBgKiqVxvX8L5\nvTzkc7hFZsgXH+fDrORTe28hiEGLVeOPsYx0T91HoPZ8JAZYep1jBBRvr+RLrtiP\nHjumvFES\n-----END PRIVATE KEY-----\n";
     public static String zhouhuanPubKey2 = "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAELZtnP30dbtdFrvherJxfpPEQP+q3\nRyrtECAuEwZg3o8/RLJva0O6unNLHGavkwd77l5UgvX4cPNoX/OV6n/3xQ==\n-----END PUBLIC KEY-----\n";
     public static String zhouhuanPriKey2 = "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgNBYWsObyiuXLIZZZ\nPa0P/aNSrlf3//TLkdhZsDroRNugCgYIKoEcz1UBgi2hRANCAAQtm2c/fR1u10Wu\n+F6snF+k8RA/6rdHKu0QIC4TBmDejz9Esm9rQ7q6c0scZq+TB3vuXlSC9fhw82hf\n85Xqf/fF\n-----END PRIVATE KEY-----\n";
-    public static String zhouhuanAddress1 = "zxf8dcce2b5374610631735ad4d606372ff199d89e";
+    public static String zhouhuanAddress1 = "ZX12ff8e4796700cf194bae72749d5bd7179864644";
     public static String zhouhuanAddress2 = "zx26ff9db9cf1e981e3028b7e133d54b28eb859f97";
     public static String ID_CARD_1 = "142323198302062216";
     public static String ID_CARD_2 = "150422199805206019";
@@ -639,15 +639,17 @@ public class TestZxlnftSdkUtil {
     @Test
     public void nft037AddressList(){
         Nft037AddressListReqDto reqDto = Nft037AddressListReqDto.getNew();
-        reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
-//        reqDto.setAddr(zhouhuanAddress2);
+//        reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
+        reqDto.setAddr(zhouhuanAddress1);
 
         //无限制系列
-        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_8a827e181b695fb8d9b081d3855d2895ced1d003ee186622a005cec37ea77e59");
+//        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_8a827e181b695fb8d9b081d3855d2895ced1d003ee186622a005cec37ea77e59");
         //系列001
 //        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_ca49b5ebadd5f73ab057fe869bf897cbcc0f31e0b89db71cc3ec78bca2d16ed6");
         //系列002
 //        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_31ff9f7d4c33c98518e095fec6cecdab8d337751602cf6e651eb7d131cff5b61");
+
+        reqDto.setSeriesId("4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef_224c288ded71e9a75190f018eb7e5382119c2d7a2216aaa4dbd7e602b82e247e");
 //        reqDto.setOffset(0l);
         reqDto.setLimit(1000l);
         ZxlnftResponseDto<Nft037AddressListRespDto> resp = zxlnftSdkUtil.nft037AddressList(reqDto);
@@ -660,8 +662,8 @@ public class TestZxlnftSdkUtil {
     @Test
     public void nft038AddressWithoutSeriesList(){
         Nft038AddressWithoutSeriesListReqDto reqDto = Nft038AddressWithoutSeriesListReqDto.getNew();
-        reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
-//        reqDto.setAddr(zhouhuanAddress1);
+//        reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
+        reqDto.setAddr(zhouhuanAddress1);
 //        reqDto.setOffset(0l);
         reqDto.setLimit(1000l);
         ZxlnftResponseDto<Nft038AddressWithoutSeriesListRespDto> resp = zxlnftSdkUtil.nft038AddressWithoutSeriesList(reqDto);