~api:开盲盒后清除盲盒藏品;

~api:开盲盒失败提示修复;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkGenRdsReceiver.java

@@ -137,7 +137,7 @@
 //        // Redis记录VO
 //        redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(digitalArtworkVo.getArtworkId()), digitalArtworkVo);
 //        // Redis更新藏品ID列表
-//        this.addGoblinUserDigitalArtworkIds(uid, artworkId);
+//        this.addGoblinUserDigitalArtworkIds(uid, artworkId, fromArtworkId);
 //        // Redis生成标记（缓存三天），用于上面的生成检查
 //        redisUtil.set(genMarkerKey, 1, 259200);
 //
@@ -191,13 +191,14 @@
 //    /**
 //     * 缓存并更新用户藏品ID集合
 //     */
-//    public boolean addGoblinUserDigitalArtworkIds(String uid, String artworkId) {
+//    public boolean addGoblinUserDigitalArtworkIds(String uid, String artworkId, String boxArtworkId) {
 //        List<String> ids = this.getUserDigitalArtworkIdsFromRdb(uid);
 //        if (CollectionUtils.isEmpty(ids)) {
 //            ids = CollectionUtil.arrayListString();
 //            ids.add(artworkId);
 //        } else {
 //            ids.add(0, artworkId);
+//            if (null != boxArtworkId) ids.remove(boxArtworkId);
 //            int size = ids.size();
 //            if (size > 30) ids.remove(size - 1);
 //        }

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

@@ -215,7 +215,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             // Redis记录VO
             goblinRedisUtils.setUserDigitalArtworkVo(initUserDigitalArtworkVo);
             // Redis更新藏品ID列表
-            goblinRedisUtils.addUserDigitalArtworkIds(uid, artworkId);
+            goblinRedisUtils.addUserDigitalArtworkIdsForUnbox(uid, artworkId, userDigitalArtworkBoxVo.getArtworkId());
 //            // Redis生成标记（缓存三天），用于上面的生成检查
 //            goblinRedisUtils.markGenUserDigitalArtwork(uid, skuId, orderId);
 
@@ -234,6 +234,8 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             LinkedList<Object[]> updateBoxArtworkObjs = CollectionUtil.linkedListObjectArr();
             updateBoxArtworkObjs.add(new Object[]{now, now, now, userDigitalArtworkBoxVo.getArtworkId()});
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_ARTWORK_GEN.getKey(), SqlMapping.gets(toMqSqls, initUserDigitalArtworkObjs, updateBoxArtworkObjs));
+
+            return unboxDigitalArtworkListVo;
         }
         return null;
     }

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

@@ -1598,16 +1598,33 @@ public class GoblinRedisUtils {
         return redisUtil.hasKey(GoblinRedisConst.USER_DIGITAL_ARTWORK_GENMARK.concat(uid).concat(skuId).concat(orderId));
     }
 
+//    /**
+//     * 缓存并更新用户藏品ID集合
+//     */
+//    public boolean addUserDigitalArtworkIds(String uid, String artworkId) {
+//        List<String> ids = this.getUserDigitalArtworkIds(uid);
+//        if (CollectionUtils.isEmpty(ids)) {
+//            ids = CollectionUtil.arrayListString();
+//            ids.add(artworkId);
+//        } else {
+//            ids.add(0, artworkId);
+//            int size = ids.size();
+//            if (size > 30) ids.remove(size - 1);
+//        }
+//        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid), ids);
+//    }
+
     /**
-     * 缓存并更新用户藏品ID集合
+     * 开启盲盒：缓存并更新用户藏品ID集合
      */
-    public boolean addUserDigitalArtworkIds(String uid, String artworkId) {
+    public boolean addUserDigitalArtworkIdsForUnbox(String uid, String artworkId, String boxArtworkId) {
         List<String> ids = this.getUserDigitalArtworkIds(uid);
         if (CollectionUtils.isEmpty(ids)) {
             ids = CollectionUtil.arrayListString();
             ids.add(artworkId);
         } else {
             ids.add(0, artworkId);
+            ids.remove(boxArtworkId);
             int size = ids.size();
             if (size > 30) ids.remove(size - 1);
         }