实现xuper发行购买功能

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/bo/GalaxySeriesNftInfoBo.java

@@ -76,6 +76,11 @@ public class GalaxySeriesNftInfoBo implements Serializable,Cloneable {
      */
     private String nftPublishStatus;
 
+    /**
+     * nft发行交易hash
+     */
+    private String nftPublishTradeHash;
+
     //======================================
     //=============以下都为购买信息=============
     //======================================

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/biz/GalaxyEnumBiz.java

@@ -17,7 +17,7 @@ import com.liquidnet.service.galaxy.constant.GalaxyEnum;
 public class GalaxyEnumBiz {
 
     /**
-     * 任务状态转换
+     * 任务状态转换（至信链通用状态 百度链为系列声明状态转换）
      * @param routerType
      * @param code
      * @return
@@ -48,16 +48,10 @@ public class GalaxyEnumBiz {
                     break;
                 }
             case "xuper":
-                if(code.equalsIgnoreCase(XuperEnum.AssetPublishStatusEnum.INIT.getCode())||code.equalsIgnoreCase(XuperEnum.AssetPublishStatusEnum.PUBLISHING.getCode())){
-                    taskStatusEnum = GalaxyEnum.TaskStatusEnum.PROCESSING;
-                    break;
-                }else if(code.equalsIgnoreCase(XuperEnum.AssetPublishStatusEnum.PUBLISH_SUCCESS.getCode())){
+                if(code.equalsIgnoreCase(XuperEnum.AssetPublishStatusEnum.INIT.getCode())){
                     taskStatusEnum = GalaxyEnum.TaskStatusEnum.TASK_SUCCESS;
                     break;
-                }else if(code.equalsIgnoreCase(XuperEnum.AssetPublishStatusEnum.FREEZING.getCode())
-                        ||code.equalsIgnoreCase(XuperEnum.AssetPublishStatusEnum.BANNEDING.getCode())
-                        ||code.equalsIgnoreCase(XuperEnum.AssetPublishStatusEnum.BANNEDED.getCode())
-                ){
+                }{
                     taskStatusEnum = GalaxyEnum.TaskStatusEnum.TASK_FAIL;
                     break;
                 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/utils/AbstractDataUtils.java

@@ -116,7 +116,7 @@ public abstract class AbstractDataUtils {
                     SqlMapping.get("galaxy_series_info.insert"),
                     new Object[]{seriesInfoBo.getSeriesInfoId(),seriesInfoBo.getSeriesName(),seriesCode,null,seriesInfoBo.getTotalCount()
                             ,seriesInfoBo.getCrtCount(),seriesInfoBo.getSeriesClaimTaskId(),seriesInfoBo.getSeriesClaimStatus(),seriesInfoBo.getCoverUrl(),seriesInfoBo.getSeriesDesc()
-                            ,nftCount,seriesInfoBo.getRouterType(),LocalDateTime.now(),null
+                            ,nftCount,seriesInfoBo.getTradeHash(),seriesInfoBo.getRouterType(),LocalDateTime.now(),null
                     }
                     , MQConst.GalaxyQueue.SQL_SERIES_INFO.getKey()
             );
@@ -253,7 +253,7 @@ public abstract class AbstractDataUtils {
         try{
             this.getQueueUtil().sendMySqlRedis(
                     SqlMapping.get("galaxy_series_nft_info.updateSeriesNftPublishStatus"),
-                    new Object[]{seriesNftInfoBo.getNftPublishStatus(),nowTimeStr,seriesNftInfoBo.getSkuId()}
+                    new Object[]{seriesNftInfoBo.getNftPublishStatus(),seriesNftInfoBo.getNftPublishTradeHash(),nowTimeStr,seriesNftInfoBo.getSkuId()}
                     , MQConst.GalaxyQueue.SQL_SERIES_INFO.getKey()
             );
         }catch(Exception e){

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/resources/sqlmap-galaxy.properties

 # ------------------------用户注册信息----------------------------
 galaxy_user_info.insert=insert into galaxy_user_info (user_id, user_name, user_type, mobile, id_card_type, id_card, mnemonic, mnemonic_index,user_identification, user_pub_key, user_pri_key, block_chain_address, router_type,created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 # ------------------------数字藏品系列信息----------------------------
-galaxy_series_info.insert=insert into galaxy_series_info (series_info_id, series_name, series_code, series_id, total_count, crt_count,series_claim_task_id, series_claim_status, cover_url, series_desc, nft_count,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+galaxy_series_info.insert=insert into galaxy_series_info (series_info_id, series_name, series_code, series_id, total_count, crt_count,series_claim_task_id, series_claim_status, cover_url, series_desc, nft_count,trade_hash,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 # ------------------------数字藏品系列NFT信息----------------------------
 galaxy_series_nft_info.insert=insert into galaxy_series_nft_info (series_nft_info_id, series_info_id, sku_id, series_name, series_code,series_id, nft_total_count, nft_crt_count, nft_id_begin ,nft_id_begin_index ,nft_publish_number,original_nft_url, original_display_url,author, nft_name, nft_url, display_url, nft_desc, nft_flag, sell_count, nft_hash,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 # ------------------------数字藏品订单信息----------------------------
@@ -28,6 +28,6 @@ galaxy_series_nft_info.updateSeriesNftCrtCount=update galaxy_series_nft_info t s
 # ------------------------更新发行购买处理结果----------------------------
 galaxy_nft_order_fail_log.updateDealWithStatus=update galaxy_nft_order_fail_log t set t.deal_with_status = ?,t.updated_at =? where t.nft_order_pay_id = ? and t.router_type = ?
 # ------------------------更新系列NFT发行状态信息----------------------------
-galaxy_series_nft_info.updateSeriesNftPublishStatus=update galaxy_series_nft_info t set t.publish_status = ?,t.updated_at =? where t.sku_id = ?
+galaxy_series_nft_info.updateSeriesNftPublishStatus=update galaxy_series_nft_info t set t.publish_status = ?,t.publish_trade_hash = ?,t.updated_at =? where t.sku_id = ?
 # ------------------------同步用户数字账户信息到adam---------------------------
 adam_user_busi_acct.add=INSERT INTO adam_user_busi_acct (`uid`, busi, uuid, `work`, ppwd, `state`, created_at) VALUES (?,?,?,?,?,?,?) 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_galaxy_20220715.sql

 alter table galaxy_series_nft_info
-    add publish_status varchar(10) null comment 'nft发行状态(-1初始化 0发行中 1发行成功 2发行失败)' after router_type;
+    add publish_status varchar(10) null comment 'nft发行状态(-1初始化 0发行中 1发行成功 2发行失败)' after router_type;
\ No newline at end of file
+
+alter table galaxy_series_nft_info
+    add publish_trade_hash varchar(200) null comment 'nft发行交易hash' after publish_status;
\ No newline at end of file

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

@@ -8,7 +8,6 @@ import com.liquidnet.common.third.xuper.constant.XuperEnum;
 import com.liquidnet.common.third.xuper.dto.*;
 import com.liquidnet.common.third.xuper.exception.XupterException;
 import com.liquidnet.common.third.xuper.util.XuperSdkUtil;
-import com.liquidnet.common.third.zxlnft.constant.ZxlnftEnum;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -207,12 +206,14 @@ public class XuperArtworkBiz {
             //返回参数
             String seriesId = null;
             String taskId = null;
+            String tradeHash = null; //系列声明hash,这里暂时用返回参数request_id
 
             seriesClaimRespDto = GalaxyArtSeriesClaimRespDto.getNew();
             if(StringUtil.isNotNull(xuper002CreateAssetRespDto)&&xuper002CreateAssetRespDto.errNo==0){
                 //第零个系列 无限制系列
                 taskId = String.valueOf(xuper002CreateAssetRespDto.getAssetId());
                 seriesId = String.valueOf(xuper002CreateAssetRespDto.getAssetId());
+                tradeHash = String.valueOf(xuper002CreateAssetRespDto.getRequestId());
                 //构造缓存数据
                 if(StringUtil.isNull(seriesInfoBo)){
                     //
@@ -227,6 +228,7 @@ public class XuperArtworkBiz {
                     seriesInfoBo.setSeriesCode(seriesCode);
                     seriesInfoBo.setSeriesId(seriesId);
                     seriesInfoBo.setSeriesClaimTaskId(taskId);
+                    seriesInfoBo.setTradeHash(tradeHash);
                     dataUtils.setSeriesInfoBo(reqDto.getRouterType(),seriesCode,seriesInfoBo);
 
                     //构造系列nft信息
@@ -291,7 +293,7 @@ public class XuperArtworkBiz {
             return ResponseDto.failure(GalaxyErrorEnum.SERIES_NOT_EXIST.getCode(), GalaxyErrorEnum.SERIES_NOT_EXIST.getMessage());
         }
         if(seriesInfoBo.getSeriesClaimStatus().equalsIgnoreCase(GalaxyEnum.SeriesClaimStatusEnum.SUCCESS.getCode())){
-            GalaxyArtSeriesClaimResultQueryRespDto resultQueryRespDto = this.buildGalaxyArtSeriesClaimResultQueryRespDto(reqDto,seriesInfoBo, ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode());
+            GalaxyArtSeriesClaimResultQueryRespDto resultQueryRespDto = this.buildGalaxyArtSeriesClaimResultQueryRespDto(reqDto,seriesInfoBo, XuperEnum.AssetPublishStatusEnum.INIT.getCode());
             return  ResponseDto.success(resultQueryRespDto);
         }
 
@@ -330,7 +332,7 @@ public class XuperArtworkBiz {
                 dataUtils.updateSeriesClaimStatus(reqDto.getRouterType(),seriesCode,seriesInfoBo,reqDto.getSkuId());
 
                 //设置成功返回参数
-                GalaxyArtSeriesClaimResultQueryRespDto resultQueryRespDto = this.buildGalaxyArtSeriesClaimResultQueryRespDto(reqDto,seriesInfoBo,ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode());
+                GalaxyArtSeriesClaimResultQueryRespDto resultQueryRespDto = this.buildGalaxyArtSeriesClaimResultQueryRespDto(reqDto,seriesInfoBo,XuperEnum.AssetPublishStatusEnum.INIT.getCode());
 
                 return ResponseDto.success(resultQueryRespDto);
             }else if(respDto.getMeta().getStatus() != Integer.parseInt(XuperEnum.AssetPublishStatusEnum.INIT.getCode())

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

@@ -90,6 +90,7 @@ public class XuperTradeBiz {
         //初始化订单数据
         if(nftOrderBo==null){
             nftOrderBo = galaxyBeanTransferBiz.buildNftOrderBo(reqDto.getNftOrderPayId(),userInfoBo,seriesNftInfoBo);
+            nftOrderBo.setNftPublishTaskId(seriesNftInfoBo.getSeriesId());
             nftOrderBo.setNftPublishFromAddress(xuperConfig.getNftPlatformAddress());
             nftOrderBo.setNftBuyFromAddress(xuperConfig.getNftPlatformAddress());
             dataUtils.setNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId(),nftOrderBo);
@@ -220,10 +221,11 @@ public class XuperTradeBiz {
                                 nftId = seriesId.concat("_").concat(seriesBeginIndex.toString());;
                                 nftPublishChainTimestamp = DateUtil.getNowSeconds();
                                 nftPublishStatus = Integer.parseInt(GalaxyEnum.AssetPublishStatusEnum.SUCCESS.getCode());
-                                nftPublishTradeHash = publishTaskId;
+                                nftPublishTradeHash = nftPublishResultQueryRespDto.getTxHash();
 
                                 //首次查询nft发行状态,如果成功更新nft系列发行状态
                                 seriesNftInfoBo.setNftPublishStatus(GalaxyEnum.AssetPublishStatusEnum.SUCCESS.getCode());
+                                seriesNftInfoBo.setNftPublishTradeHash(nftPublishTradeHash);
                                 seriesNftInfoBo.setUpdatedAt(LocalDateTime.now());
                                 dataUtils.updateSeriesNftPublishStatus(reqDto.getRouterType(),reqDto.getSkuId(),seriesNftInfoBo);
                             } else if (nftPublishResultQueryRespDto.getTaskStatus().toString().equals(GalaxyEnum.AssetPublishStatusEnum.FAIL.getCode())) {

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

@@ -25,7 +25,6 @@ import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftInfoBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadTempSecretBo;
 import com.liquidnet.service.galaxy.dto.param.*;
-import com.liquidnet.service.galaxy.exception.GalaxyNftUserException;
 import com.liquidnet.service.galaxy.utils.GalaxyDataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -248,102 +247,6 @@ public class ZxinArtworkBiz {
         return ResponseDto.success(seriesClaimRespDto);
     }
 
-
-    public ResponseDto<GalaxyArtSeriesClaimRespDto> seriesClaimBackup(GalaxyArtSeriesClaimReqDto reqDto) {
-        //系列声明用到参数
-        String skuId = reqDto.getSkuId();
-        String seriesName = GalaxyConstant.SERIES_NAME_PREFIX.concat(skuId);
-        Long totalCount = reqDto.getTotalCount();
-        String coverUrl = reqDto.getCoverUrl();//暂时用nftUrl
-        String seriesDesc = reqDto.getSeriesDesc();
-        //发行用到的相关信息
-        String author = reqDto.getAuthor();
-        String nftName = reqDto.getNftName();
-        String nftUrl = reqDto.getNftUrl();
-        String displayUrl = reqDto.getDisplayUrl();
-        String nftDesc = reqDto.getNftDesc();
-        String nftFlag = reqDto.getNftFlag();
-        String sellCount = reqDto.getSellCount();
-
-
-        //返回参数
-        String seriesId = null;
-        String taskId = null;
-        GalaxySeriesInfoBo seriesInfoBo = dataUtils.getSeriesInfoBo(reqDto.getRouterType(),reqDto.getSkuId());
-        if(StringUtil.isNotNull(seriesInfoBo)){
-            /**
-             * 如果系列声明成功，则不允许继续声明
-             */
-            if(seriesInfoBo.getSeriesClaimStatus().equalsIgnoreCase(GalaxyEnum.SeriesClaimStatusEnum.SUCCESS.getCode())){
-                GalaxyArtSeriesClaimRespDto seriesClaimRespDto = GalaxyArtSeriesClaimRespDto.getNew();
-                seriesClaimRespDto.setSkuId(skuId);
-                seriesClaimRespDto.setNftUrl(nftUrl);
-                seriesClaimRespDto.setSeriesId(seriesInfoBo.getSeriesId());
-                seriesClaimRespDto.setSeriesName(seriesInfoBo.getSeriesName());
-                return ResponseDto.success(seriesClaimRespDto);
-            }
-        }
-        /**
-         * 进行系列声明
-         */
-        Nft030SeriesClaimReqDto nft030ReqDto = Nft030SeriesClaimReqDto.getNew();
-        nft030ReqDto.setPubKey(zxlnftConfig.getNftPlatformPubKey());
-        nft030ReqDto.setSeriesName(seriesName);
-        //无限制系列 设置为0
-        nft030ReqDto.setTotalCount(totalCount);
-        nft030ReqDto.setOperateId(IDGenerator.get32UUID());
-        //系列封面
-        nft030ReqDto.setCoverUrl(coverUrl);
-        nft030ReqDto.setDesc(seriesDesc);
-        nft030ReqDto.setMaxPublishCount(0);
-        nft030ReqDto.setSeriesBeginFromZero(false);
-        ZxlnftResponseDto<Nft030SeriesClaimRespDto> nft30RespDto = zxlnftSdkUtil.nft030SeriesClaim(nft030ReqDto);
-
-        //{"taskId":"49d1cccc-e62c-40bc-923c-bfac31325351_nft-series-claim_1"}
-        if(nft30RespDto.isSuccess()){
-            //系列声明结果查询
-            Nft031SeriesClaimResultReqDto nft031ReqDto = Nft031SeriesClaimResultReqDto.getNew();
-            //第零个系列 无限制系列
-            taskId = nft30RespDto.getData().getTaskId();
-            nft031ReqDto.setTaskId(taskId);
-
-            int count  = 0;
-            while(StringUtil.isEmpty(seriesId)){
-                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());
-                    return ResponseDto.failure(GalaxyErrorEnum.SERIES_CLAIM_ERROR.getCode(), GalaxyErrorEnum.SERIES_CLAIM_ERROR.getMessage());
-                }
-                if(count==5){
-                    log.info("=======查询共5次，跳出循环！taskId:{}",nft031ReqDto.getTaskId());
-                    return ResponseDto.failure(GalaxyErrorEnum.SERIES_CLAIM_ERROR_FIVE_TIMES.getCode(), GalaxyErrorEnum.SERIES_CLAIM_ERROR_FIVE_TIMES.getMessage());
-                }
-            }
-
-            log.info("系列声明结果查询 seriesId :{}",seriesId);
-        }
-
-        GalaxyArtSeriesClaimRespDto seriesClaimRespDto = GalaxyArtSeriesClaimRespDto.getNew();
-        seriesClaimRespDto.setSkuId(skuId);
-        seriesClaimRespDto.setNftUrl(nftUrl);
-        seriesClaimRespDto.setSeriesId(seriesId);
-        seriesClaimRespDto.setSeriesName(seriesName);
-
-        //构造缓存数据
-        if(seriesInfoBo==null){
-            //设置为处理中
-            String publishStatus = GalaxyEnum.SeriesClaimStatusEnum.PROCESSING.getCode();
-            seriesInfoBo = this.buildSeriesInfoBo(reqDto,null,publishStatus);
-            dataUtils.setSeriesInfoBo(reqDto.getRouterType(),reqDto.getSkuId(),seriesInfoBo);
-        }
-        return ResponseDto.success(seriesClaimRespDto);
-    }
-
     public ResponseDto<GalaxyArtSeriesClaimResultQueryRespDto> seriesClaimResultQuery(GalaxyArtSeriesClaimResultQueryReqDto reqDto) {
         //根据skuId获取系列nft信息
         GalaxySeriesNftInfoBo seriesNftInfoBo = dataUtils.getSeriesNftInfoBo(reqDto.getRouterType(),reqDto.getSkuId());
@@ -450,7 +353,7 @@ public class ZxinArtworkBiz {
         return  fullFilePath;
     }
 
-    public GalaxySeriesNftUploadTempSecretBo getSeriesNftUploadTempSecret(String seriesName){
+    private GalaxySeriesNftUploadTempSecretBo getSeriesNftUploadTempSecret(String seriesName){
         //获取临时密钥
         GalaxySeriesNftUploadTempSecretBo seriesNftUploadTempSecretBo = dataUtils.getSeriesNftUploadTempSecretBo(seriesName);
         if(StringUtil.isNull(seriesNftUploadTempSecretBo)){