合并发行与购买

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

@@ -21,6 +21,11 @@ import java.io.Serializable;
 @ApiModel(value = "GalaxyNftPublishResultQueryReqDto", description = "NFT发行结果查询")
 @Data
 public class GalaxyNftPublishAndBuyResultQueryReqDto extends GalaxyBaseReqDto implements Serializable,Cloneable {
+    @ApiModelProperty(position = 1, required = true, value = "用户ID[30]")
+    @NotBlank(message = "用户ID不能为空！")
+    @Size(min = 1, max = 30, message = "用户ID限制2-30位且不能包含特殊字符")
+    private String userId;
+
     /**
      * nftOrderPayId
      */

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

@@ -19,12 +19,31 @@ import java.io.Serializable;
 @ApiModel(value = "GalaxyNftPublishResultQueryRespDto", description = "NFT发行结果查询")
 @Data
 public class GalaxyNftPublishAndBuyResultQueryRespDto implements Serializable,Cloneable {
-    /**
-     * nftId格式，发行人公钥hash_系列_系列索引id,申请多少个，最后一段计算出来即可，
-     * 比如申请10个，nftIdBegin位xx_xx_1,那么就可以推导出x_xx_1到x_xx_10
-     */
-    @ApiModelProperty(position = 3, required = true, value = "nftId格式")
-    private String nftIdBegin;
+
+    @ApiModelProperty(position = 1, required = true, value = "用户ID[30]")
+    private String userId;
+
+    @ApiModelProperty(position = 2, required = true, value = "nft订单唯一id")
+    private String nftOrderPayId;
+
+    @ApiModelProperty(position = 3, required = true, value = "nft发行时间")
+    private String nftPublishChainTimestamp;
+
+    @ApiModelProperty(position = 4, required = true, value = "nft发行状态")
+    private String nftPublishStatus;
+
+    @ApiModelProperty(position = 5, required = true, value = "nft发行交易hash")
+    private String nftPublishTxHash;
+
+    @ApiModelProperty(position = 6, required = true, value = "nft购买时间")
+    private String nftBuyChainTimestamp;
+
+    @ApiModelProperty(position = 7, required = true, value = "nft购买状态")
+    private String nftBuyStatus;
+
+    @ApiModelProperty(position = 8, required = true, value = "nft购买交易hash")
+    private String nftBuyTxHash;
+
 
     @Override
     public String toString() {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-galaxy/src/main/java/com/liquidnet/service/consumer/galaxy/config/ConsumerJsonNftPublishAndBuyConfig.java

@@ -36,7 +36,7 @@ public class ConsumerJsonNftPublishAndBuyConfig extends RedisStreamConfig {
     StringRedisTemplate stringRedisTemplate;
 
     @Bean
-    public List<Subscription> subscriptionSqlNftOrderInfo(RedisConnectionFactory factory) {
+    public List<Subscription> subscriptionJsonNftPublishAndBuy(RedisConnectionFactory factory) {
         List<Subscription> subscriptionList = new ArrayList<>();
         MQConst.GalaxyQueue stream = MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY;
 

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-galaxy/src/main/java/com/liquidnet/service/consumer/galaxy/service/processor/ConsumerJsonNftPublishAndBuyProcessor.java

@@ -19,9 +19,9 @@ import com.liquidnet.service.galaxy.dto.bo.GalaxyUserInfoBo;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftBuyRespDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishAndBuyReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishAndBuyRespDto;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
@@ -36,7 +36,7 @@ import java.math.BigDecimal;
  * @date 2022/3/29 17:04
  */
 @Slf4j
-@Data
+@Component
 public class ConsumerJsonNftPublishAndBuyProcessor {
     @Autowired
     private ZxlnftSdkUtil zxlnftSdkUtil;
@@ -49,6 +49,7 @@ public class ConsumerJsonNftPublishAndBuyProcessor {
 
     @Autowired
     private DataUtils dataUtils;
+
     public ResponseDto<GalaxyNftPublishAndBuyRespDto> nftPublishAndBuy(GalaxyNftPublishAndBuyReqDto reqDto) {
         //获取订单信息
         GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());