修改nft发行逻辑

joying-common/src/main/java/com/fzm/common/service/impl/CommemorateNftServiceImpl.java

@@ -89,12 +89,13 @@ public class CommemorateNftServiceImpl extends ServiceImpl<CommemorateNftMapper,
         if (StringUtils.isBlank(tradeHash)) {
             throw GlobalException.newException(ResultCode.PUBLISH_ERROR, "nft发行失败");
         }
-        String realHash = paraChainClient.getRealTxHashFromGrp(hash);
+
         // 确认交易结果
-        TxResult txResult = paraChainClient.cycleConfirmTxWithHash(realHash, false, 1000);
+        TxResult txResult = paraChainClient.cycleConfirmTxWithHash(hash, true, 1000);
         if (!TxStatusEnum.SUCCESS.equals(txResult.getStatus())) {
             throw GlobalException.newException(ResultCode.PUBLISH_ERROR, txResult.getErrMsg().getValue());
         }
+        String realHash = paraChainClient.getRealTxHashFromGrp(hash);
         commemorateNft.setNftHash(realHash).setTokenId(tokenId).setPublishTime(new Date());
         save(commemorateNft);
         // 使用nft发行量作为Redisson信号量限制领取次数

joying-common/src/main/java/com/fzm/common/service/impl/NftServiceImpl.java

@@ -111,7 +111,6 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
         String[] split = txHash.split("-");
         String hash = split[0];
         long tokenId = Long.parseLong(split[1]);
-        String realHash = paraChainClient.getRealTxHashFromGrp(hash);
         Nft nft = getById(nftDto.getId());
         // 构建上链信息
         HashMap<String, String> map = new HashMap<>();
@@ -126,10 +125,11 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
             throw GlobalException.newException(ResultCode.PUBLISH_ERROR, "nft发行失败");
         }
         // 确认交易结果
-        TxResult txResult = paraChainClient.cycleConfirmTxWithHash(realHash, false, 1000);
+        TxResult txResult = paraChainClient.cycleConfirmTxWithHash(hash, true, 1000);
         if (!TxStatusEnum.SUCCESS.equals(txResult.getStatus())) {
             throw GlobalException.newException(ResultCode.PUBLISH_ERROR, txResult.getErrMsg().getValue());
         }
+        String realHash = paraChainClient.getRealTxHashFromGrp(hash);
         nft.setNftHash(realHash);
         nft.setTokenId(tokenId);
         nft.setPublishTime(new Date());