Merge branch 'dev_nft_411' of...

Merge branch 'dev_nft_411' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_nft_411

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -193,6 +193,12 @@ public class GoblinRedisConst {
      */
     public static final String USER_DIGITAL_ARTWORK_CT = PREFIX.concat("u_d_art_ct:");
 
+    /**
+     * 藏品盲盒开启标记
+     * {goblin:u_d_art_ub:${artworkId}, Number}
+     */
+    public static final String USER_DIGITAL_ARTWORK_UNBOX = PREFIX.concat("u_d_art_ub:");
+
     /**
      * 我的藏品生成标记（有时效）
      * {goblin:u_d_art:${uid+skuId+orderId},1}

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

@@ -164,7 +164,9 @@ public class ConsumerGoblinBizArtworkGenRdsReceiver extends AbstractBizRedisRece
         bizNftBuyMap.put("message", bizNftBuyNode.toString());
         streamOperations.add(StreamRecords.mapBacked(bizNftBuyMap).withStreamKey(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey()));
 
-        redisUtil.incr(GoblinRedisConst.USER_DIGITAL_ARTWORK_CT.concat(uid), 1);
+        if (!fromBoxArtworkFlg) {
+            redisUtil.incr(GoblinRedisConst.USER_DIGITAL_ARTWORK_CT.concat(uid), 1);
+        }
         // Redis生成标记（缓存三天），用于上面的生成检查
         redisUtil.set(genMarkerKey, 1, 259200);
         return true;

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

@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.IGoblinUserDigitalArtworkService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -88,17 +89,24 @@ public class GoblinUserDigitalArtworkController {
             unboxDigitalArtworkListVo.setSubtitle(unboxSkuInfoVo.getSubtitle());
             unboxDigitalArtworkListVo.setCoverPic(unboxSkuInfoVo.getSkuPic());
             return ResponseDto.success(unboxDigitalArtworkListVo);
+        } else if (goblinRedisUtils.markUnboxUserDigitalArtwork(artworkId) > 1) {
+            return ResponseDto.failure(ErrorMapping.get("140000"));
         }
         GoblinUserDigitalArtworkListVo unboxingRstVo = null;
-        switch (userDigitalArtworkVo.getSource()) {
-            case 1:
-            case 2:
-                unboxingRstVo = goblinUserDigitalArtworkService.unboxingForBuyOrExchange(currentUid, userDigitalArtworkVo);
-                break;
-            case 3:
-            default:
-                log.warn("Invalid operation[UID={},artworkId={}]", currentUid, artworkId);
+        try {
+            switch (userDigitalArtworkVo.getSource()) {
+                case 1:
+                case 2:
+                    unboxingRstVo = goblinUserDigitalArtworkService.unboxingForBuyOrExchange(currentUid, userDigitalArtworkVo);
+                    break;
+                case 3:
+                default:
+                    log.warn("Invalid operation[UID={},artworkId={}]", currentUid, artworkId);
+            }
+        } catch (Exception e) {
+            log.error("开启盲盒异常[artworkId={},uid={}]", artworkId, currentUid);
         }
+        goblinRedisUtils.del(GoblinRedisConst.USER_DIGITAL_ARTWORK_UNBOX.concat(artworkId));
         return null == unboxingRstVo ? ResponseDto.failure(ErrorMapping.get("140102")) : ResponseDto.success(unboxingRstVo);
     }
 }

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

@@ -39,7 +39,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             PagedResult<GoblinUserDigitalArtworkListVo> listVoPagedResult = ObjectUtil.getGoblinUserDigitalArtworkListVoPagedResult();
             List<String> subArtworkIdList;
             if (artworkNum > 30 && pageNum * pageSize > 30) {// 查询Mongo
-                if ((long) pageNum * pageSize > artworkNum) pageNum = Math.toIntExact(artworkNum / pageSize);
+//                if ((long) pageNum * pageSize > artworkNum) pageNum = Math.toIntExact(artworkNum / pageSize);
                 subArtworkIdList = goblinMongoUtils.getPageUserDigitalArtworkIds(uid, pageNum, pageSize);
                 if (CollectionUtils.isEmpty(subArtworkIdList)) {
                     log.warn("#我的藏品列表:藏品IDS数据为空[uid={},artworkNum={}]", uid, artworkNum);
@@ -47,12 +47,15 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
                 }
             } else {
                 List<String> userDigitalArtworkIds = goblinRedisUtils.getUserDigitalArtworkIds(uid);
-                if (CollectionUtils.isEmpty(userDigitalArtworkIds)) {
+//                if (CollectionUtils.isEmpty(userDigitalArtworkIds)) {
+                if (CollectionUtils.isEmpty(userDigitalArtworkIds) || ((pageNum - 1) * pageSize > (userDigitalArtworkIds.size() - 1))) {
                     log.warn("#我的藏品列表:藏品IDS缓存为空[uid={},artworkNum={}]", uid, artworkNum);
                     return pageVo.setArtworkNum((int) artworkNum).setPagedResult(listVoPagedResult).setSystime(LocalDateTime.now());
                 }
+
                 int cacheSize = userDigitalArtworkIds.size(), cacheNum = cacheSize / pageSize;// 分几页
-                int fromIndex = Math.min(Math.min(cacheNum, pageNum - 1) * pageSize, cacheSize - 1);
+//                int fromIndex = Math.min(Math.min(cacheNum, pageNum - 1) * pageSize, cacheSize - 1);
+                int fromIndex = (pageNum - 1) * pageSize;
                 subArtworkIdList = userDigitalArtworkIds.subList(fromIndex, Math.min(fromIndex + pageSize, cacheSize));
             }
 

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

@@ -1442,6 +1442,10 @@ public class GoblinRedisUtils {
         return (List<String>) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid));
     }
 
+    public long markUnboxUserDigitalArtwork(String artworkId) {
+        return redisUtil.incr(GoblinRedisConst.USER_DIGITAL_ARTWORK_UNBOX.concat(artworkId), 1);
+    }
+
     public long countUserDigitalArtwork(String uid) {
         Object o = redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK_CT.concat(uid));
         return Objects.isNull(o) ? 0 : (int) o;