~queue;

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

@@ -130,23 +130,16 @@ public class ConsumerGoblinBizArtworkGenRdsReceiver extends AbstractBizRedisRece
                                 .getUpdateObject()
                 );
             }
+        } else {
+            redisUtil.incr(GoblinRedisConst.USER_DIGITAL_ARTWORK_CT.concat(uid), 1);
         }
         // Redis记录VO
         redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(digitalArtworkVo.getArtworkId()), digitalArtworkVo);
         // Redis更新藏品ID列表
-        List<String> userDigitalArtworkIds = this.getUserDigitalArtworkIdsFromRdb(uid);
-        if (CollectionUtils.isEmpty(userDigitalArtworkIds)) {
-            userDigitalArtworkIds = CollectionUtil.arrayListString();
-            userDigitalArtworkIds.add(artworkId);
-        } else {
-            userDigitalArtworkIds.add(0, artworkId);
-            if (fromBoxArtworkFlg) {
-                userDigitalArtworkIds.remove(fromArtworkId);
-            }
-            int size = userDigitalArtworkIds.size();
-            if (size > 30) userDigitalArtworkIds.remove(size - 1);
-        }
-        redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid), userDigitalArtworkIds);
+        this.addGoblinUserDigitalArtworkIds(uid, artworkId);
+        // Redis生成标记（缓存三天），用于上面的生成检查
+        redisUtil.set(genMarkerKey, 1, 259200);
+
         StreamOperations<String, Object, Object> streamOperations = stringRedisTemplate.opsForStream();
         // Mysql持久化
         HashMap<String, String> sqlArtworkMap = CollectionUtil.mapStringString();
@@ -163,12 +156,6 @@ public class ConsumerGoblinBizArtworkGenRdsReceiver extends AbstractBizRedisRece
                 .put("skuId", skuId).put("userId", uid).put("buyTimestamp", DateUtil.Formatter.yyyyMMddHHmmss.format(now));
         bizNftBuyMap.put("message", bizNftBuyNode.toString());
         streamOperations.add(StreamRecords.mapBacked(bizNftBuyMap).withStreamKey(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey()));
-
-        if (!fromBoxArtworkFlg) {
-            redisUtil.incr(GoblinRedisConst.USER_DIGITAL_ARTWORK_CT.concat(uid), 1);
-        }
-        // Redis生成标记（缓存三天），用于上面的生成检查
-        redisUtil.set(genMarkerKey, 1, 259200);
         return true;
     }
 
@@ -198,6 +185,22 @@ public class ConsumerGoblinBizArtworkGenRdsReceiver extends AbstractBizRedisRece
         return (List<String>) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid));
     }
 
+    /**
+     * 缓存并更新用户藏品ID集合
+     */
+    public boolean addGoblinUserDigitalArtworkIds(String uid, String artworkId) {
+        List<String> ids = this.getUserDigitalArtworkIdsFromRdb(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);
+    }
+
     public GoblinGoodsSkuInfoVo getGoodsSkuInfoVoFromRdb(String skuId) {
         String rk = GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId);
         GoblinGoodsSkuInfoVo vo = (GoblinGoodsSkuInfoVo) redisUtil.get(rk);