Merge remote-tracking branch 'origin/pre' into jxl_419_dotask

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkVo.java

@@ -31,6 +31,7 @@ public class GoblinUserDigitalArtworkVo implements Serializable, Cloneable {
     /* ---------------------- 冗余SPU信息 ---------------------- */
     private String author;
     private String publisher;
+    private String hitArtworkId;
 
     private static final GoblinUserDigitalArtworkVo obj = new GoblinUserDigitalArtworkVo();
 

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/util/ZxlnftSdkUtil.java

@@ -716,7 +716,8 @@ public class ZxlnftSdkUtil {
             BeanUtil.copy(reqDto,req);
             req.setPubKey(zxlnftConfig.getNftPlatformPubKey());
             req.setPlatformPubKey(zxlnftConfig.getNftPlatformPubKey());
-            req.setHash(zxlnftBiz.getHashString(req.getUrl()));
+//            req.setHash(zxlnftBiz.getHashString(req.getUrl()));
+            req.setHash(reqDto.getMetaData());
 
             /**
              * 发行人的私钥签名，签名对象是(platformPubKey_pubKey_接口名_author_name_url_displayUrl_hash_desc_flag_publishCount_seriesId_seriesBeginIndex

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();

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinUserDigitalArtworkController.java

@@ -85,6 +85,7 @@ public class GoblinUserDigitalArtworkController {
             GoblinNftOrderVo goblinNftOrder = goblinRedisUtils.getGoblinNftOrder(userDigitalArtworkVo.getOrderId());
             GoblinGoodsSkuInfoVo unboxSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(goblinNftOrder.getBoxSkuId());
             GoblinUserDigitalArtworkListVo unboxDigitalArtworkListVo = GoblinUserDigitalArtworkListVo.getNew();
+            unboxDigitalArtworkListVo.setArtworkId(userDigitalArtworkVo.getHitArtworkId());
             unboxDigitalArtworkListVo.setName(unboxSkuInfoVo.getName());
             unboxDigitalArtworkListVo.setSubtitle(unboxSkuInfoVo.getSubtitle());
             unboxDigitalArtworkListVo.setCoverPic(unboxSkuInfoVo.getSkuPic());

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinUserDigitalArtworkServiceImpl.java

@@ -180,12 +180,14 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
         userDigitalArtworkBoxVo.setDeletedAt(now);
 
         if (goblinMongoUtils.updateUserDigitalArtworkVoByUnboxing(userDigitalArtworkBoxVo)) {
+            String artworkId = IDGenerator.nextMilliId2();
+
             String orderId = userDigitalArtworkBoxVo.getOrderId();
             GoblinNftOrderVo orderVo = goblinRedisUtils.getGoblinNftOrder(orderId);
             GoblinGoodsSkuInfoVo unboxSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(orderVo.getBoxSkuId());
 
             GoblinUserDigitalArtworkListVo unboxDigitalArtworkListVo = GoblinUserDigitalArtworkListVo.getNew();
-//            unboxDigitalArtworkListVo.setArtworkId();
+            unboxDigitalArtworkListVo.setArtworkId(artworkId);
             unboxDigitalArtworkListVo.setName(unboxSkuInfoVo.getName());
             unboxDigitalArtworkListVo.setSubtitle(unboxSkuInfoVo.getSubtitle());
             unboxDigitalArtworkListVo.setCoverPic(unboxSkuInfoVo.getSkuPic());
@@ -201,12 +203,13 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 //                log.warn("#UNBOX_ARTWORK EXIST_ART[uid={},skuId={},orderId={},source={}]", uid, skuId, orderId, source);
 //                return unboxDigitalArtworkListVo;
 //            }
+            userDigitalArtworkBoxVo.setHitArtworkId(artworkId);
             goblinRedisUtils.setexUserDigitalArtworkVo(userDigitalArtworkBoxVo);
 
             GoblinGoodsInfoVo goodsInfoVo = goblinRedisUtils.getGoodsInfoVo(spuId);
 
             GoblinUserDigitalArtworkVo initUserDigitalArtworkVo = GoblinUserDigitalArtworkVo.getNew();
-            String artworkId = IDGenerator.nextMilliId2();
+//            String artworkId = IDGenerator.nextMilliId2();
             initUserDigitalArtworkVo.setArtworkId(artworkId);
             initUserDigitalArtworkVo.setSkuId(skuId);
             initUserDigitalArtworkVo.setUid(uid);