Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411

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

@@ -29,7 +29,10 @@ public enum GalaxyErrorEnum {
     NFT_BUY_FAIL_SERIES_NFT_NOT_EXIST("NFT0010016","NFT购买失败，系列NFT信息不存在!"),
     NFT_PUBLISH_ERROR("NFT0010017","NFT发行异常!"),
     NFT_BUY_ERROR("NFT0010018","NFT购买异常!"),
-    NFT_PUBLISH_AND_BUY_QUERY_FAIL("NFT0010019","NFT发行和购买结果查询失败!");
+    NFT_PUBLISH_AND_BUY_QUERY_FAIL("NFT0010019","NFT发行和购买结果查询失败!"),
+    NFT_QUERY_FAIL_ORDER_NOT_EXIST("NFT0010020","NFT订单不存在!"),
+    NFT_QUERY_FAIL_NFT_NOT_EXIST("NFT0010021","NFT信息查询不存在!"),
+    NFT_QUERY_FAIL_SERIES_NOT_EXIST("NFT0010022","系列信息查询不存在!");
 
 
     private String code;

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyQueryNftInfoReqDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -19,8 +20,9 @@ import java.io.Serializable;
 @ApiModel(value = "GalaxyQueryNftInfoReqDto", description = "NFT信息查询")
 @Data
 public class GalaxyQueryNftInfoReqDto extends GalaxyBaseReqDto implements Serializable,Cloneable{
-    @ApiModelProperty(position = 1, required = true, value = "skuId")
-    private String skuId;
+    @ApiModelProperty(position = 1, required = true, value = "nftOrderPayId")
+    @NotBlank
+    private String nftOrderPayId;
 
     @Override
     public String toString(){

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/controller/GalaxyTradeQueryController.java

@@ -56,7 +56,7 @@ public class GalaxyTradeQueryController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "系列查询")
     @PostMapping(value = {"querySeriesInfo"})
-    ResponseDto<GalaxyQuerySeriesInfoRespDto> querySeriesInfo(GalaxyQuerySeriesInfoReqDto reqDto){
+    ResponseDto<GalaxyQuerySeriesInfoRespDto> querySeriesInfo(@Valid @RequestBody GalaxyQuerySeriesInfoReqDto reqDto){
         return galaxyTradeQueryService.querySeriesInfo(reqDto);
     }
 
@@ -64,7 +64,7 @@ public class GalaxyTradeQueryController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "用户系列NFT查询")
     @PostMapping(value = {"queryUserSeriesNftList"})
-    ResponseDto<GalaxyQueryUserSeriesNftListRespDto> queryUserSeriesNftList(GalaxyQueryUserSeriesNftListReqDto reqDto){
+    ResponseDto<GalaxyQueryUserSeriesNftListRespDto> queryUserSeriesNftList(@Valid @RequestBody GalaxyQueryUserSeriesNftListReqDto reqDto){
         return galaxyTradeQueryService.queryUserSeriesNftList(reqDto);
     }
 
@@ -72,7 +72,7 @@ public class GalaxyTradeQueryController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "用户所有进出NFT信息查询")
     @PostMapping(value = {"queryUserTradeAllList"})
-    ResponseDto<GalaxyQueryUserTradeAllListRespDto> queryUserTradeAllList(GalaxyQueryUserTradeAllListReqDto reqDto){
+    ResponseDto<GalaxyQueryUserTradeAllListRespDto> queryUserTradeAllList(@Valid @RequestBody GalaxyQueryUserTradeAllListReqDto reqDto){
         return galaxyTradeQueryService.queryUserTradeAllList(reqDto);
     }
 
@@ -80,7 +80,7 @@ public class GalaxyTradeQueryController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "用户所有进NFT信息查询")
     @PostMapping(value = {"queryUserTradeInList"})
-    ResponseDto<GalaxyQueryUserTradeInListRespDto> queryUserTradeInList(GalaxyQueryUserTradeInListReqDto reqDto){
+    ResponseDto<GalaxyQueryUserTradeInListRespDto> queryUserTradeInList(@Valid @RequestBody GalaxyQueryUserTradeInListReqDto reqDto){
         return galaxyTradeQueryService.queryUserTradeInList(reqDto);
     }
 
@@ -88,7 +88,7 @@ public class GalaxyTradeQueryController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "用户所有出NFT信息查询")
     @PostMapping(value = {"queryUserTradeOutList"})
-    ResponseDto<GalaxyQueryUserTradeOutListRespDto> queryUserTradeOutList(GalaxyQueryUserTradeOutListReqDto reqDto){
+    ResponseDto<GalaxyQueryUserTradeOutListRespDto> queryUserTradeOutList(@Valid @RequestBody GalaxyQueryUserTradeOutListReqDto reqDto){
         return galaxyTradeQueryService.queryUserTradeOutList(reqDto);
     }
 }

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

@@ -441,9 +441,9 @@ public class ZxinArtworkBiz {
             }else{
                 seriesNftUploadTempSecretBo = GalaxySeriesNftUploadTempSecretBo.getNew();
                 seriesNftUploadTempSecretBo.setTempSecretId(nft022RespDto.getData().getTempSecretId());
-                seriesNftUploadTempSecretBo.setTempSecretKey(nft022RespDto.getData().getTempSecretId());
-                seriesNftUploadTempSecretBo.setSessionToken(nft022RespDto.getData().getTempSecretId());
-                seriesNftUploadTempSecretBo.setUploadAddress(nft022RespDto.getData().getTempSecretId());
+                seriesNftUploadTempSecretBo.setTempSecretKey(nft022RespDto.getData().getTempSecretKey());
+                seriesNftUploadTempSecretBo.setSessionToken(nft022RespDto.getData().getSessionToken());
+                seriesNftUploadTempSecretBo.setUploadAddress(nft022RespDto.getData().getUploadAddress());
                 seriesNftUploadTempSecretBo.setTimestamp(DateUtil.getNowTime());
                 dataUtils.setSeriesNftUploadTempSecretBo(seriesName,seriesNftUploadTempSecretBo);
             }

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

 package com.liquidnet.service.galaxy.router.zxin.biz;
 
 import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz;
-import com.liquidnet.common.third.zxlnft.dto.Nft037AddressListReqDto;
-import com.liquidnet.common.third.zxlnft.dto.Nft037AddressListRespDto;
-import com.liquidnet.common.third.zxlnft.dto.ZxlnftResponseDto;
+import com.liquidnet.common.third.zxlnft.dto.*;
 import com.liquidnet.common.third.zxlnft.util.ZxlWalletSdkUtil;
 import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.galaxy.constant.GalaxyErrorEnum;
+import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftInfoBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxyUserInfoBo;
 import com.liquidnet.service.galaxy.dto.param.*;
@@ -45,7 +44,25 @@ public class ZxinTradeQueryBiz implements IGalaxyRouterStrategyTradeQuery {
 
     @Override
     public ResponseDto<GalaxyQueryNftInfoRespDto> queryNftInfo(GalaxyQueryNftInfoReqDto reqDto) {
-        return null;
+        //获取订单信息
+        GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());
+        if(StringUtil.isNull(nftOrderBo)){
+            return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_ORDER_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_ORDER_NOT_EXIST.getMessage());
+        }
+        if(StringUtil.isEmpty(nftOrderBo.getNftId())){
+            return ResponseDto.failure(GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getCode(),GalaxyErrorEnum.NFT_QUERY_FAIL_NFT_NOT_EXIST.getMessage());
+        }
+
+        Nft036InfoReqDto nft036InfoReqDto = Nft036InfoReqDto.getNew();
+        nft036InfoReqDto.setNftId(nftOrderBo.getNftId());
+        ZxlnftResponseDto<Nft036InfoRespDto> zxlnftResponseDto = zxlnftSdkUtil.nft036Info(nft036InfoReqDto);
+        //查询结果
+        GalaxyQueryNftInfoRespDto queryNftInfoRespDto = GalaxyQueryNftInfoRespDto.getNew();
+        if(zxlnftResponseDto.isSuccess()){
+            BeanUtil.copy(zxlnftResponseDto.getData(),queryNftInfoRespDto);
+            return ResponseDto.success(queryNftInfoRespDto);
+        }
+        return ResponseDto.failure();
     }
 
     @Override