Merge branch 'pre' into 'master'

Pre

See merge request !214

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinTradeCommonBiz.java

@@ -183,7 +183,7 @@ public class ZxinTradeCommonBiz {
             nft034ReqDto.setSellStatus(Integer.parseInt(ZxlnftEnum.SellStatusEnum.CAN_SELL.getCode()));
             nft034ReqDto.setSellCount(sellCount);
             nft034ReqDto.setOperateId(IDGenerator.get32UUID());
-            nft034ReqDto.setMetaData("");
+            nft034ReqDto.setMetaData(seriesNftInfoBo.getNftHash());
 
             ZxlnftResponseDto<Nft034PublishRespDto> nft034RespDto = zxlnftSdkUtil.nft034Publish(nft034ReqDto);
 

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

@@ -193,7 +193,11 @@ public class ZxinTradeBiz {
 
         //判断是否需要二次购买
         if(isNeedSecondBuy){
-            queueUtil.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), JsonUtils.toJson(reqDto));
+            GalaxyNftPublishAndBuyReqDto galaxyNftPublishAndBuyReqDto = GalaxyNftPublishAndBuyReqDto.getNew();
+            BeanUtil.copy(reqDto,galaxyNftPublishAndBuyReqDto);
+            galaxyNftPublishAndBuyReqDto.setSkuId(nftOrderBo.getSkuId());
+            galaxyNftPublishAndBuyReqDto.setBuyTimestamp(DateUtil.getNowTime());
+            queueUtil.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), JsonUtils.toJson(galaxyNftPublishAndBuyReqDto));
         }
 
         GalaxyNftPublishAndBuyResultQueryRespDto resultQueryRespDto = GalaxyNftPublishAndBuyResultQueryRespDto.getNew();