完善nft发行购买相关功能

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

@@ -58,6 +58,11 @@ public class ZxinPublishBiz {
     @Autowired
     private ZxinTradeBiz zxinTradeBiz;
 
+    /**
+     * nft发行
+     * @param reqDto
+     * @return
+     */
     public ResponseDto<GalaxyNftPublishRespDto> nftPublish(GalaxyNftPublishReqDto reqDto) {
         //获取订单信息
         GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());
@@ -153,6 +158,11 @@ public class ZxinPublishBiz {
         return ResponseDto.success(nftPublishRespDto);
     }
 
+    /**
+     * nft发行结果查询
+     * @param reqDto
+     * @return
+     */
     public ResponseDto<GalaxyNftPublishResultQueryRespDto> nftPublishResultQuery(GalaxyNftPublishResultQueryReqDto reqDto){
         //获取订单信息
         GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());
@@ -179,7 +189,7 @@ public class ZxinPublishBiz {
 
             //更新缓存数据状态
             nftOrderBo.setNftId(nft035RespDtoTemp.getData().getNftIdBegin());
-            dataUtils.updateNftOrderInfo(reqDto.getRouterType(),reqDto.getNftOrderPayId(),nftOrderBo);
+            dataUtils.updateNftOrderPublishInfo(reqDto.getRouterType(),reqDto.getNftOrderPayId(),nftOrderBo);
 
 
             return ResponseDto.success(nftPublishResultQueryRespDto);
@@ -188,6 +198,11 @@ public class ZxinPublishBiz {
         }
     }
 
+    /**
+     * 以下为nft发行同步返回方法(暂时废弃)
+     * @param reqDto
+     * @return
+     */
     public ResponseDto<GalaxyNftPublishRespDto> nftPublishBackup(GalaxyNftPublishReqDto reqDto) {
         //获取订单信息
         GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());

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

 package com.liquidnet.service.galaxy.router.zxin.service;
 
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.galaxy.constant.GalaxyEnum;
 import com.liquidnet.service.galaxy.dto.param.*;
 import com.liquidnet.service.galaxy.router.strategy.IGalaxyRouterStrategyTrade;
@@ -34,7 +32,7 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr
 
     @Override
     public ResponseDto<GalaxyNftPublishAndBuyRespDto> nftPublishAndBuy(GalaxyNftPublishAndBuyReqDto reqDto) {
-        queueUtil.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), JsonUtils.toJson(reqDto));
+//        queueUtil.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), JsonUtils.toJson(reqDto));
 //        return ResponseDto.success();
         return zxinTradeBiz.nftPublishAndBuy(reqDto);
     }

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/utils/DataUtils.java

@@ -327,13 +327,19 @@ public class DataUtils {
         }
     }
 
-    public void updateNftOrderInfo(String routerType,String nftOrderPayId,GalaxyNftOrderBo nftOrderBo) {
+    /**
+     * 更新nft订单发行数据
+     * @param routerType
+     * @param nftOrderPayId
+     * @param nftOrderBo
+     */
+    public void updateNftOrderPublishInfo(String routerType,String nftOrderPayId,GalaxyNftOrderBo nftOrderBo) {
         redisUtil.set(GalaxyConstant.REDIS_KEY_GALAXY_TRADE.concat(routerType).concat(":") + nftOrderPayId,nftOrderBo,keyExpireTime);
 
         Query query = Query.query(Criteria.where("nftOrderPayId").is(nftOrderBo.getNftOrderPayId()));
         Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(nftOrderBo)));
         update.set("nftId", nftOrderBo.getNftId());
-        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now());
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nftOrderBo.getUpdatedAt());
         update.set("updatedAt",nowTimeStr);
         UpdateResult result = mongoTemplate.updateFirst(query,update, GalaxyNftOrderVo.class,GalaxyNftOrderVo.class.getSimpleName());
         log.info("updateNftOrderInfo result:{}",result.toString());
@@ -350,13 +356,18 @@ public class DataUtils {
         }
     }
 
-    public void updateNftOrderBuyTaskId(String routerType,String nftOrderPayId,GalaxyNftOrderBo nftOrderBo) {
+    /**
+     * 更新nft订单购买数据
+     * @param routerType
+     * @param nftOrderPayId
+     * @param nftOrderBo
+     */
+    public void updateNftOrderBuyInfo(String routerType,String nftOrderPayId,GalaxyNftOrderBo nftOrderBo) {
         redisUtil.set(GalaxyConstant.REDIS_KEY_GALAXY_TRADE.concat(routerType).concat(":") + nftOrderPayId,nftOrderBo,keyExpireTime);
 
         Query query = Query.query(Criteria.where("nftOrderPayId").is(nftOrderPayId));
         Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(nftOrderBo)));
-        update.set("nftBuyTaskId", nftOrderBo.getNftBuyTaskId());
-        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now());
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nftOrderBo.getUpdatedAt());
         update.set("updatedAt",nowTimeStr);
         UpdateResult result = mongoTemplate.updateFirst(query,update, GalaxyNftOrderVo.class,GalaxyNftOrderVo.class.getSimpleName());
         log.info("updateNftOrderInfo result:{}",result.toString());