~api:开启盲盒+返回值artworkId;

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